EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
CS
Yurii63b7223b4bb0
diff --git a/application/Espo/Core/Utils/Database/Dbal/ConnectionFactoryFactory.php b/application/Espo/Core/Utils/Database/Dbal/ConnectionFactoryFactory.phpindex 87e841dcd9..d43621707b 100644--- a/application/Espo/Core/Utils/Database/Dbal/ConnectionFactoryFactory.php+++ b/application/Espo/Core/Utils/Database/Dbal/ConnectionFactoryFactory.php@@ -39,7 +39,7 @@ class ConnectionFactoryFactory{public function __construct(private Metadata $metadata,- private InjectableFactory $injectableFactory+ private InjectableFactory $injectableFactory,) {}public function create(string $platform, PDO $pdo): ConnectionFactory@@ -49,7 +49,7 @@ class ConnectionFactoryFactory->get(['app', 'databasePlatforms', $platform, 'dbalConnectionFactoryClassName']);if (!$className) {- throw new RuntimeException("No DBAL ConnectionFactory for {$platform}.");+ throw new RuntimeException("No DBAL ConnectionFactory for '$platform'.");}$bindingContainer = BindingContainerBuilder::create()diff --git a/application/Espo/Core/Utils/Database/Dbal/Factories/MysqlConnectionFactory.php b/application/Espo/Core/Utils/Database/Dbal/Factories/MysqlConnectionFactory.phpindex 2f943840a8..8758def6ef 100644--- a/application/Espo/Core/Utils/Database/Dbal/Factories/MysqlConnectionFactory.php+++ b/application/Espo/Core/Utils/Database/Dbal/Factories/MysqlConnectionFactory.php@@ -40,12 +40,15 @@ use Espo\ORM\PDO\Options as PdoOptions;use PDO;use RuntimeException;+/**+ * @noinspection PhpUnused+ */class MysqlConnectionFactory implements ConnectionFactory{- private const DEFAULT_CHARSET = 'utf8mb4';+ private const string DEFAULT_CHARSET = 'utf8mb4';public function __construct(- private PDO $pdo+ private PDO $pdo,) {}/**diff --git a/application/Espo/Core/Utils/Database/Dbal/Factories/PostgresqlConnectionFactory.php b/application/Espo/Core/Utils/Database/Dbal/Factories/PostgresqlConnectionFactory.phpindex 73c1699815..e1dea4c208 100644--- a/application/Espo/Core/Utils/Database/Dbal/Factories/PostgresqlConnectionFactory.php+++ b/application/Espo/Core/Utils/Database/Dbal/Factories/PostgresqlConnectionFactory.php@@ -41,13 +41,16 @@ use Espo\ORM\PDO\Options as PdoOptions;use PDO;use RuntimeException;+/**+ * @noinspection PhpUnused+ */class PostgresqlConnectionFactory implements ConnectionFactory{- private const DEFAULT_CHARSET = 'utf8';+ private const string DEFAULT_CHARSET = 'utf8';public function __construct(private PDO $pdo,- private Helper $helper+ private Helper $helper,) {}/**diff --git a/application/Espo/Core/Utils/Database/Dbal/Platforms/PostgreSQLSchemaManager.php b/application/Espo/Core/Utils/Database/Dbal/Platforms/PostgreSQLSchemaManager.phpindex eacdef8266..f8f6f80df2 100644--- a/application/Espo/Core/Utils/Database/Dbal/Platforms/PostgreSQLSchemaManager.php+++ b/application/Espo/Core/Utils/Database/Dbal/Platforms/PostgreSQLSchemaManager.php@@ -92,11 +92,6 @@ class PostgreSQLSchemaManager extends BasePostgreSQLSchemaManager$part = str_replace("(", '', $part);$part = str_replace(")", '', $part);- $list = array_map(- fn ($item) => trim($item),- explode(' ', $part)- );-- return $list;+ return array_map(fn ($item) => trim($item), explode(' ', $part));}}diff --git a/application/Espo/Core/Utils/Database/Dbal/Platforms/PostgresqlPlatform.php b/application/Espo/Core/Utils/Database/Dbal/Platforms/PostgresqlPlatform.phpindex e04c657be5..f796a2173b 100644--- a/application/Espo/Core/Utils/Database/Dbal/Platforms/PostgresqlPlatform.php+++ b/application/Espo/Core/Utils/Database/Dbal/Platforms/PostgresqlPlatform.php@@ -34,9 +34,11 @@ use Doctrine\DBAL\Platforms\PostgreSQL100Platform;use Doctrine\DBAL\Schema\Index;use Doctrine\DBAL\Schema\Table;+use InvalidArgumentException;+class PostgresqlPlatform extends PostgreSQL100Platform{- private const TEXT_SEARCH_CONFIG = 'pg_catalog.simple';+ private const string TEXT_SEARCH_CONFIG = 'pg_catalog.simple';private ?string $textSearchConfig;@@ -64,7 +66,7 @@ class PostgresqlPlatform extends PostgreSQL100Platform$columns = $index->getColumns();if (count($columns) === 0) {- throw new \InvalidArgumentException(sprintf(+ throw new InvalidArgumentException(sprintf('Incomplete or invalid index definition %s on table %s',$name,$table,@@ -78,6 +80,6 @@ class PostgresqlPlatform extends PostgreSQL100Platform$textSearchConfig = preg_replace('/[^A-Za-z0-9_.\-]+/', '', $textSearchConfig) ?? '';$configPart = $this->quoteStringLiteral($textSearchConfig);- return "CREATE INDEX {$name} ON {$table} USING GIN (TO_TSVECTOR({$configPart}, {$columnsPart})) {$partialPart}";+ return "CREATE INDEX $name ON $table USING GIN (TO_TSVECTOR($configPart, $columnsPart)) $partialPart";}}diff --git a/application/Espo/Core/Utils/Database/Dbal/Types/LongtextType.php b/application/Espo/Core/Utils/Database/Dbal/Types/LongtextType.phpindex 93a878b50d..e3eeb93243 100644--- a/application/Espo/Core/Utils/Database/Dbal/Types/LongtextType.php+++ b/application/Espo/Core/Utils/Database/Dbal/Types/LongtextType.php@@ -37,7 +37,7 @@ use Doctrine\DBAL\Types\TextType;*/class LongtextType extends TextType{- public const NAME = 'longtext';+ public const string NAME = 'longtext';public function getName(){diff --git a/application/Espo/Core/Utils/Database/Dbal/Types/MediumtextType.php b/application/Espo/Core/Utils/Database/Dbal/Types/MediumtextType.phpindex 67050f009e..5cb2f0d95b 100644--- a/application/Espo/Core/Utils/Database/Dbal/Types/MediumtextType.php+++ b/application/Espo/Core/Utils/Database/Dbal/Types/MediumtextType.php@@ -37,7 +37,7 @@ use Doctrine\DBAL\Types\TextType;*/class MediumtextType extends TextType{- public const NAME = 'mediumtext';+ public const string NAME = 'mediumtext';public function getName(){diff --git a/application/Espo/Core/Utils/Database/Dbal/Types/UuidType.php b/application/Espo/Core/Utils/Database/Dbal/Types/UuidType.phpindex 66125e1cb1..386f6ea274 100644--- a/application/Espo/Core/Utils/Database/Dbal/Types/UuidType.php+++ b/application/Espo/Core/Utils/Database/Dbal/Types/UuidType.php@@ -37,7 +37,7 @@ use Doctrine\DBAL\Types\Type;*/class UuidType extends Type{- public const NAME = 'uuid';+ public const string NAME = 'uuid';public function getName(){diff --git a/application/Espo/Core/Utils/Database/DetailsProviders/MysqlDetailsProvider.php b/application/Espo/Core/Utils/Database/DetailsProviders/MysqlDetailsProvider.phpindex 739510b78e..f78b2c50cc 100644--- a/application/Espo/Core/Utils/Database/DetailsProviders/MysqlDetailsProvider.php+++ b/application/Espo/Core/Utils/Database/DetailsProviders/MysqlDetailsProvider.php@@ -32,10 +32,13 @@ namespace Espo\Core\Utils\Database\DetailsProviders;use Espo\Core\Utils\Database\DetailsProvider;use PDO;+/**+ * @noinspection PhpUnused+ */class MysqlDetailsProvider implements DetailsProvider{- public const TYPE_MYSQL = 'MySQL';- public const TYPE_MARIADB = 'MariaDB';+ public const string TYPE_MYSQL = 'MySQL';+ public const string TYPE_MARIADB = 'MariaDB';public function __construct(private PDO $pdodiff --git a/application/Espo/Core/Utils/Database/DetailsProviders/PostgresqlDetailsProvider.php b/application/Espo/Core/Utils/Database/DetailsProviders/PostgresqlDetailsProvider.phpindex 36a5cecca4..2ef3dc8c83 100644--- a/application/Espo/Core/Utils/Database/DetailsProviders/PostgresqlDetailsProvider.php+++ b/application/Espo/Core/Utils/Database/DetailsProviders/PostgresqlDetailsProvider.php@@ -32,9 +32,12 @@ namespace Espo\Core\Utils\Database\DetailsProviders;use Espo\Core\Utils\Database\DetailsProvider;use PDO;+/**+ * @noinspection PhpUnused+ */class PostgresqlDetailsProvider implements DetailsProvider{- private const TYPE_POSTGRESQL = 'PostgreSQL';+ private const string TYPE_POSTGRESQL = 'PostgreSQL';public function __construct(private PDO $pdo){}diff --git a/application/Espo/Core/Utils/Database/Schema/Builder.php b/application/Espo/Core/Utils/Database/Schema/Builder.phpindex 73f42efba0..f982dadc32 100644--- a/application/Espo/Core/Utils/Database/Schema/Builder.php+++ b/application/Espo/Core/Utils/Database/Schema/Builder.php@@ -56,8 +56,8 @@ use Espo\ORM\Type\AttributeType;*/class Builder{- private const ATTR_ID = 'id';- private const ATTR_DELETED = 'deleted';+ private const string ATTR_ID = 'id';+ private const string ATTR_DELETED = 'deleted';private int $idLength;private string $idDbType;diff --git a/application/Espo/Core/Utils/Database/Schema/ColumnPreparatorFactory.php b/application/Espo/Core/Utils/Database/Schema/ColumnPreparatorFactory.phpindex c167d3b065..539eab08c3 100644--- a/application/Espo/Core/Utils/Database/Schema/ColumnPreparatorFactory.php+++ b/application/Espo/Core/Utils/Database/Schema/ColumnPreparatorFactory.php@@ -40,7 +40,7 @@ class ColumnPreparatorFactorypublic function __construct(private Metadata $metadata,private InjectableFactory $injectableFactory,- private Helper $helper+ private Helper $helper,) {}public function create(string $platform): ColumnPreparator@@ -50,7 +50,7 @@ class ColumnPreparatorFactory->get(['app', 'databasePlatforms', $platform, 'columnPreparatorClassName']);if (!$className) {- throw new RuntimeException("No Column-Preparator for {$platform}.");+ throw new RuntimeException("No Column-Preparator for '$platform'.");}$binding = BindingContainerBuilder::create()diff --git a/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/MysqlColumnPreparator.php b/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/MysqlColumnPreparator.phpindex ed75381570..b6ba579823 100644--- a/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/MysqlColumnPreparator.php+++ b/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/MysqlColumnPreparator.php@@ -40,22 +40,25 @@ use Espo\ORM\Defs\AttributeDefs;use Espo\ORM\Defs\Params\AttributeParam;use Espo\ORM\Entity;+/**+ * @noinspection PhpUnused+ */class MysqlColumnPreparator implements ColumnPreparator{- private const PARAM_DB_TYPE = AttributeParam::DB_TYPE;- private const PARAM_DEFAULT = AttributeParam::DEFAULT;- private const PARAM_NOT_NULL = AttributeParam::NOT_NULL;- private const PARAM_AUTOINCREMENT = 'autoincrement';- private const PARAM_PRECISION = 'precision';- private const PARAM_SCALE = 'scale';- private const PARAM_BINARY = 'binary';+ private const string PARAM_DB_TYPE = AttributeParam::DB_TYPE;+ private const string PARAM_DEFAULT = AttributeParam::DEFAULT;+ private const string PARAM_NOT_NULL = AttributeParam::NOT_NULL;+ private const string PARAM_AUTOINCREMENT = 'autoincrement';+ private const string PARAM_PRECISION = 'precision';+ private const string PARAM_SCALE = 'scale';+ private const string PARAM_BINARY = 'binary';private const string PARAM_STORE_ARRAY_VALUES = 'storeArrayValues';- public const TYPE_MYSQL = 'MySQL';- public const TYPE_MARIADB = 'MariaDB';+ public const string TYPE_MYSQL = 'MySQL';+ public const string TYPE_MARIADB = 'MariaDB';- private const MB4_INDEX_LENGTH_LIMIT = 3072;- private const DEFAULT_INDEX_LIMIT = 1000;+ private const int MB4_INDEX_LENGTH_LIMIT = 3072;+ private const int DEFAULT_INDEX_LIMIT = 1000;/** @var string[] */private array $mediumTextTypeList = [@@ -74,7 +77,7 @@ class MysqlColumnPreparator implements ColumnPreparatorprivate ?int $maxIndexLength = null;public function __construct(- private Helper $helper+ private Helper $helper,) {}public function prepare(AttributeDefs $defs): Columndiff --git a/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/PostgresqlColumnPreparator.php b/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/PostgresqlColumnPreparator.phpindex cc1a4452bb..b54293a1b7 100644--- a/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/PostgresqlColumnPreparator.php+++ b/application/Espo/Core/Utils/Database/Schema/ColumnPreparators/PostgresqlColumnPreparator.php@@ -37,14 +37,17 @@ use Espo\ORM\Defs\AttributeDefs;use Espo\ORM\Defs\Params\AttributeParam;use Espo\ORM\Entity;+/**+ * @noinspection PhpUnused+ */class PostgresqlColumnPreparator implements ColumnPreparator{- private const PARAM_DB_TYPE = AttributeParam::DB_TYPE;- private const PARAM_DEFAULT = AttributeParam::DEFAULT;- private const PARAM_NOT_NULL = AttributeParam::NOT_NULL;- private const PARAM_AUTOINCREMENT = 'autoincrement';- private const PARAM_PRECISION = 'precision';- private const PARAM_SCALE = 'scale';+ private const string PARAM_DB_TYPE = AttributeParam::DB_TYPE;+ private const string PARAM_DEFAULT = AttributeParam::DEFAULT;+ private const string PARAM_NOT_NULL = AttributeParam::NOT_NULL;+ private const string PARAM_AUTOINCREMENT = 'autoincrement';+ private const string PARAM_PRECISION = 'precision';+ private const string PARAM_SCALE = 'scale';private const string PARAM_STORE_ARRAY_VALUES = 'storeArrayValues';/** @var string[] */diff --git a/application/Espo/Core/Utils/Database/Schema/EntityDefsModifiers/JsonData.php b/application/Espo/Core/Utils/Database/Schema/EntityDefsModifiers/JsonData.phpindex d8c2737f53..77460132c5 100644--- a/application/Espo/Core/Utils/Database/Schema/EntityDefsModifiers/JsonData.php+++ b/application/Espo/Core/Utils/Database/Schema/EntityDefsModifiers/JsonData.php@@ -38,6 +38,8 @@ use Espo\ORM\Type\AttributeType;/*** A single JSON column instead of multiple field columns.+ *+ * @noinspection PhpUnused*/class JsonData implements EntityDefsModifier{diff --git a/application/Espo/Core/Utils/Database/Schema/RebuildActions/PrepareForFulltextIndex.php b/application/Espo/Core/Utils/Database/Schema/RebuildActions/PrepareForFulltextIndex.phpindex 617110b559..d689eb6bc4 100644--- a/application/Espo/Core/Utils/Database/Schema/RebuildActions/PrepareForFulltextIndex.php+++ b/application/Espo/Core/Utils/Database/Schema/RebuildActions/PrepareForFulltextIndex.php@@ -37,11 +37,14 @@ use Espo\Core\Utils\Log;use Exception;+/**+ * @noinspection PhpUnused+ */class PrepareForFulltextIndex implements RebuildAction{public function __construct(private Helper $helper,- private Log $log+ private Log $log,) {}/**@@ -80,8 +83,8 @@ class PrepareForFulltextIndex implements RebuildActionswitch (strtoupper($row['Type'])) {case 'LONGTEXT':$alterSql =- "ALTER TABLE `{$tableName}` " .- "MODIFY `{$columnName}` MEDIUMTEXT COLLATE " . $row['Collation'];+ "ALTER TABLE `$tableName` " .+ "MODIFY `$columnName` MEDIUMTEXT COLLATE " . $row['Collation'];$this->log->info('SCHEMA, Execute Query: ' . $alterSql);