From 4ae383033a3f1c33e436e3acde623ad17b6aa6c7 Mon Sep 17 00:00:00 2001 From: Arkadiy Date: Fri, 15 Oct 2021 14:46:45 +0200 Subject: [PATCH] fix missing class imports, exceptions and undefined properties (#2112) * fix exception * fix missing imports * fix access to an undefined property --- application/Espo/Controllers/InboundEmail.php | 1 + application/Espo/Controllers/TwoFactorEmail.php | 2 ++ application/Espo/Controllers/TwoFactorSms.php | 2 ++ application/Espo/Controllers/UserSecurity.php | 2 ++ application/Espo/Core/ApplicationState.php | 1 + application/Espo/Core/Authentication/Authentication.php | 2 ++ application/Espo/Core/Authentication/Result/Data.php | 2 ++ application/Espo/Core/Container.php | 2 ++ application/Espo/Core/FieldValidation/ValidatorFactory.php | 2 +- application/Espo/Core/Formula/Evaluator.php | 2 ++ application/Espo/Core/Formula/Functions/ValueType.php | 2 +- application/Espo/Core/Formula/Functions/VariableType.php | 2 +- application/Espo/Core/Htmlizer/Htmlizer.php | 2 ++ application/Espo/Core/Mail/MessageWrapper.php | 2 ++ application/Espo/Core/Select/SelectManagerFactory.php | 1 + application/Espo/Core/Select/Where/ItemGeneralConverter.php | 2 +- application/Espo/Core/Upgrades/Actions/Base/Delete.php | 2 ++ application/Espo/Core/Utils/Database/Orm/RelationManager.php | 2 ++ application/Espo/Core/WebSocket/Submission.php | 1 + application/Espo/Modules/Crm/Controllers/CaseObj.php | 3 +++ .../Espo/Modules/Crm/Controllers/KnowledgeBaseArticle.php | 2 ++ application/Espo/Modules/Crm/Controllers/Lead.php | 1 + application/Espo/Modules/Crm/Controllers/Target.php | 1 + application/Espo/Modules/Crm/Services/KnowledgeBaseArticle.php | 1 + application/Espo/Modules/Crm/Services/Meeting.php | 1 + application/Espo/Modules/Crm/Services/TargetList.php | 1 + application/Espo/ORM/Query/DeleteBuilder.php | 2 ++ application/Espo/ORM/QueryComposer/MysqlQueryComposer.php | 1 + application/Espo/Repositories/Preferences.php | 2 ++ application/Espo/Services/ExternalAccount.php | 1 + application/Espo/Services/LeadCapture.php | 1 + application/Espo/Services/RecordTree.php | 1 + application/Espo/Services/Stream.php | 2 ++ application/Espo/Tools/FieldManager/FieldManager.php | 1 + application/Espo/Tools/Import/Import.php | 2 ++ application/Espo/Tools/Pdf/PrinterController.php | 2 ++ 36 files changed, 55 insertions(+), 4 deletions(-) diff --git a/application/Espo/Controllers/InboundEmail.php b/application/Espo/Controllers/InboundEmail.php index d10a5f14a0..492d3de92f 100644 --- a/application/Espo/Controllers/InboundEmail.php +++ b/application/Espo/Controllers/InboundEmail.php @@ -29,6 +29,7 @@ namespace Espo\Controllers; +use Espo\Core\Exceptions\Error; use Espo\Core\{ Controllers\Record, Api\Request, diff --git a/application/Espo/Controllers/TwoFactorEmail.php b/application/Espo/Controllers/TwoFactorEmail.php index fd675a8431..717e18b71a 100644 --- a/application/Espo/Controllers/TwoFactorEmail.php +++ b/application/Espo/Controllers/TwoFactorEmail.php @@ -42,6 +42,8 @@ class TwoFactorEmail { private $service; + private $user; + public function __construct(Service $service, User $user) { $this->service = $service; diff --git a/application/Espo/Controllers/TwoFactorSms.php b/application/Espo/Controllers/TwoFactorSms.php index 4de03899c8..2abcd3fd56 100644 --- a/application/Espo/Controllers/TwoFactorSms.php +++ b/application/Espo/Controllers/TwoFactorSms.php @@ -42,6 +42,8 @@ class TwoFactorSms { private $service; + private $user; + public function __construct(Service $service, User $user) { $this->service = $service; diff --git a/application/Espo/Controllers/UserSecurity.php b/application/Espo/Controllers/UserSecurity.php index a810530df9..f21a6cee51 100644 --- a/application/Espo/Controllers/UserSecurity.php +++ b/application/Espo/Controllers/UserSecurity.php @@ -44,6 +44,8 @@ class UserSecurity { private $service; + private $user; + public function __construct(Service $service, User $user) { $this->service = $service; diff --git a/application/Espo/Core/ApplicationState.php b/application/Espo/Core/ApplicationState.php index fb921d0127..a306d1fdeb 100644 --- a/application/Espo/Core/ApplicationState.php +++ b/application/Espo/Core/ApplicationState.php @@ -29,6 +29,7 @@ namespace Espo\Core; +use Espo\Core\Exceptions\Error; use Espo\Entities\Portal as PortalEntity; use Espo\Entities\User as UserEntity; diff --git a/application/Espo/Core/Authentication/Authentication.php b/application/Espo/Core/Authentication/Authentication.php index d17a25a77f..2aef975b5e 100644 --- a/application/Espo/Core/Authentication/Authentication.php +++ b/application/Espo/Core/Authentication/Authentication.php @@ -86,6 +86,8 @@ class Authentication private $twoFactorLoginFactory; + private $authTokenManager; + private $hookManager; private $log; diff --git a/application/Espo/Core/Authentication/Result/Data.php b/application/Espo/Core/Authentication/Result/Data.php index a4f46ac6fd..28d1368cec 100644 --- a/application/Espo/Core/Authentication/Result/Data.php +++ b/application/Espo/Core/Authentication/Result/Data.php @@ -43,6 +43,8 @@ class Data private $loggedUser = null; + private $status = null; + private $failReason = null; private $data = []; diff --git a/application/Espo/Core/Container.php b/application/Espo/Core/Container.php index 9d56a72cd7..34d226e4a3 100644 --- a/application/Espo/Core/Container.php +++ b/application/Espo/Core/Container.php @@ -52,6 +52,8 @@ class Container implements ContainerInterface private $configuration = null; + private $bindingContainer; + private $injectableFactory; public function __construct( diff --git a/application/Espo/Core/FieldValidation/ValidatorFactory.php b/application/Espo/Core/FieldValidation/ValidatorFactory.php index 03b85df05e..99ec6ac64f 100644 --- a/application/Espo/Core/FieldValidation/ValidatorFactory.php +++ b/application/Espo/Core/FieldValidation/ValidatorFactory.php @@ -68,7 +68,7 @@ class ValidatorFactory $className = $this->getClassName($entityType, $field); if (!$className) { - throw RuntimeException("Validator for '{$entityType}.{$field}' does not exist."); + throw new RuntimeException("Validator for '{$entityType}.{$field}' does not exist."); } return $this->injectableFactory->create($className); diff --git a/application/Espo/Core/Formula/Evaluator.php b/application/Espo/Core/Formula/Evaluator.php index aa516fb10e..96f3c36c63 100644 --- a/application/Espo/Core/Formula/Evaluator.php +++ b/application/Espo/Core/Formula/Evaluator.php @@ -49,6 +49,8 @@ class Evaluator private $attributeFetcher; + private $injectableFactory; + private $parsedHash; public function __construct(InjectableFactory $injectableFactory, array $functionClassNameMap = []) diff --git a/application/Espo/Core/Formula/Functions/ValueType.php b/application/Espo/Core/Formula/Functions/ValueType.php index 552d96cc3b..4c45e380ef 100644 --- a/application/Espo/Core/Formula/Functions/ValueType.php +++ b/application/Espo/Core/Formula/Functions/ValueType.php @@ -41,7 +41,7 @@ class ValueType extends BaseFunction public function process(ArgumentList $args) { if (!count($args)) { - throw Error("Bad value."); + throw new Error("Bad value."); } $value = $args[0]->getData(); diff --git a/application/Espo/Core/Formula/Functions/VariableType.php b/application/Espo/Core/Formula/Functions/VariableType.php index d1de840e04..d8ca43beff 100644 --- a/application/Espo/Core/Formula/Functions/VariableType.php +++ b/application/Espo/Core/Formula/Functions/VariableType.php @@ -41,7 +41,7 @@ class VariableType extends BaseFunction public function process(ArgumentList $args) { if (!count($args)) { - throw Error("No variable name."); + throw new Error("No variable name."); } $name = $args[0]->getData(); diff --git a/application/Espo/Core/Htmlizer/Htmlizer.php b/application/Espo/Core/Htmlizer/Htmlizer.php index 45a326607e..911ef4753a 100644 --- a/application/Espo/Core/Htmlizer/Htmlizer.php +++ b/application/Espo/Core/Htmlizer/Htmlizer.php @@ -65,6 +65,8 @@ class Htmlizer private $dateTime; + private $number; + private $config; private $acl; diff --git a/application/Espo/Core/Mail/MessageWrapper.php b/application/Espo/Core/Mail/MessageWrapper.php index 26c496d300..e4f2fec07e 100644 --- a/application/Espo/Core/Mail/MessageWrapper.php +++ b/application/Espo/Core/Mail/MessageWrapper.php @@ -35,6 +35,8 @@ use Espo\Core\Mail\Mail\Storage\Imap; class MessageWrapper { + private $parser; + private $storage; private $id; diff --git a/application/Espo/Core/Select/SelectManagerFactory.php b/application/Espo/Core/Select/SelectManagerFactory.php index 8184bf6b21..f6f7fd7c09 100644 --- a/application/Espo/Core/Select/SelectManagerFactory.php +++ b/application/Espo/Core/Select/SelectManagerFactory.php @@ -53,6 +53,7 @@ class SelectManagerFactory private $user; private $acl; + private $aclManager; private $injectableFactory; private $classFinder; diff --git a/application/Espo/Core/Select/Where/ItemGeneralConverter.php b/application/Espo/Core/Select/Where/ItemGeneralConverter.php index 9023150382..4e4e1211d7 100644 --- a/application/Espo/Core/Select/Where/ItemGeneralConverter.php +++ b/application/Espo/Core/Select/Where/ItemGeneralConverter.php @@ -355,7 +355,7 @@ class ItemGeneralConverter implements ItemConverter } if (!$arrayAttributeLink || !$arrayAttribute) { - throw Error("Bad where item."); + throw new Error("Bad where item."); } $arrayEntityType = $entityDefs->getRelation($arrayAttributeLink)->getForeignEntityType(); diff --git a/application/Espo/Core/Upgrades/Actions/Base/Delete.php b/application/Espo/Core/Upgrades/Actions/Base/Delete.php index 05a59cc05a..ccc879b990 100644 --- a/application/Espo/Core/Upgrades/Actions/Base/Delete.php +++ b/application/Espo/Core/Upgrades/Actions/Base/Delete.php @@ -29,6 +29,8 @@ namespace Espo\Core\Upgrades\Actions\Base; +use Espo\Core\Exceptions\Error; + class Delete extends \Espo\Core\Upgrades\Actions\Base { public function run($data) diff --git a/application/Espo/Core/Utils/Database/Orm/RelationManager.php b/application/Espo/Core/Utils/Database/Orm/RelationManager.php index 49e3fcbcf6..34efd7bd31 100644 --- a/application/Espo/Core/Utils/Database/Orm/RelationManager.php +++ b/application/Espo/Core/Utils/Database/Orm/RelationManager.php @@ -37,6 +37,8 @@ class RelationManager { private $metadata; + private $config; + public function __construct(Metadata $metadata, Config $config) { $this->metadata = $metadata; diff --git a/application/Espo/Core/WebSocket/Submission.php b/application/Espo/Core/WebSocket/Submission.php index 7ee94fbcc6..5ffdef48da 100644 --- a/application/Espo/Core/WebSocket/Submission.php +++ b/application/Espo/Core/WebSocket/Submission.php @@ -32,6 +32,7 @@ namespace Espo\Core\WebSocket; use Espo\Core\Utils\Log; use stdClass; +use Throwable; class Submission { diff --git a/application/Espo/Modules/Crm/Controllers/CaseObj.php b/application/Espo/Modules/Crm/Controllers/CaseObj.php index 8842e7cdb2..eefddd1e1f 100644 --- a/application/Espo/Modules/Crm/Controllers/CaseObj.php +++ b/application/Espo/Modules/Crm/Controllers/CaseObj.php @@ -29,6 +29,9 @@ namespace Espo\Modules\Crm\Controllers; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\BadRequest; + class CaseObj extends \Espo\Core\Controllers\Record { protected $name = 'Case'; diff --git a/application/Espo/Modules/Crm/Controllers/KnowledgeBaseArticle.php b/application/Espo/Modules/Crm/Controllers/KnowledgeBaseArticle.php index 476be18e8d..15ce991067 100644 --- a/application/Espo/Modules/Crm/Controllers/KnowledgeBaseArticle.php +++ b/application/Espo/Modules/Crm/Controllers/KnowledgeBaseArticle.php @@ -29,6 +29,8 @@ namespace Espo\Modules\Crm\Controllers; +use Espo\Core\Exceptions\BadRequest; + class KnowledgeBaseArticle extends \Espo\Core\Controllers\Record { public function postActionGetCopiedAttachments($params, $data, $request) diff --git a/application/Espo/Modules/Crm/Controllers/Lead.php b/application/Espo/Modules/Crm/Controllers/Lead.php index 3b2d9dc70e..dd54056838 100644 --- a/application/Espo/Modules/Crm/Controllers/Lead.php +++ b/application/Espo/Modules/Crm/Controllers/Lead.php @@ -30,6 +30,7 @@ namespace Espo\Modules\Crm\Controllers; use Espo\Core\Exceptions\BadRequest; +use Espo\Core\Exceptions\Error; class Lead extends \Espo\Core\Controllers\Record { diff --git a/application/Espo/Modules/Crm/Controllers/Target.php b/application/Espo/Modules/Crm/Controllers/Target.php index c3491a3201..536b72d1ea 100644 --- a/application/Espo/Modules/Crm/Controllers/Target.php +++ b/application/Espo/Modules/Crm/Controllers/Target.php @@ -30,6 +30,7 @@ namespace Espo\Modules\Crm\Controllers; use Espo\Core\Exceptions\BadRequest; +use Espo\Core\Exceptions\Error; class Target extends \Espo\Core\Controllers\Record { diff --git a/application/Espo/Modules/Crm/Services/KnowledgeBaseArticle.php b/application/Espo/Modules/Crm/Services/KnowledgeBaseArticle.php index 2622513f07..68fd999cd2 100644 --- a/application/Espo/Modules/Crm/Services/KnowledgeBaseArticle.php +++ b/application/Espo/Modules/Crm/Services/KnowledgeBaseArticle.php @@ -29,6 +29,7 @@ namespace Espo\Modules\Crm\Services; +use Espo\Core\Exceptions\BadRequest; use Espo\Core\Exceptions\Forbidden; use Espo\Core\Exceptions\NotFound; use Espo\Core\Exceptions\Error; diff --git a/application/Espo/Modules/Crm/Services/Meeting.php b/application/Espo/Modules/Crm/Services/Meeting.php index 4c5dd5803d..15ff01bdf5 100644 --- a/application/Espo/Modules/Crm/Services/Meeting.php +++ b/application/Espo/Modules/Crm/Services/Meeting.php @@ -34,6 +34,7 @@ use Espo\Modules\Crm\Business\Event\Invitations; use Espo\Services\Email as EmailService; +use Espo\Core\Exceptions\NotFound; use Espo\Core\Exceptions\BadRequest; use Espo\Core\Di; diff --git a/application/Espo/Modules/Crm/Services/TargetList.php b/application/Espo/Modules/Crm/Services/TargetList.php index 7519e52f39..d2aaa99a20 100644 --- a/application/Espo/Modules/Crm/Services/TargetList.php +++ b/application/Espo/Modules/Crm/Services/TargetList.php @@ -36,6 +36,7 @@ use Espo\ORM\Query\Select; use Espo\Core\Exceptions\NotFound; use Espo\Core\Exceptions\BadRequest; use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\Error; use Espo\Core\{ Record\Collection as RecordCollection, diff --git a/application/Espo/ORM/Query/DeleteBuilder.php b/application/Espo/ORM/Query/DeleteBuilder.php index b377f4bc56..d0d2ce24fa 100644 --- a/application/Espo/ORM/Query/DeleteBuilder.php +++ b/application/Espo/ORM/Query/DeleteBuilder.php @@ -29,6 +29,8 @@ namespace Espo\ORM\Query; +use RuntimeException; + class DeleteBuilder implements Builder { use SelectingBuilderTrait; diff --git a/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php b/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php index c119463a6d..ba799b635b 100644 --- a/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php +++ b/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php @@ -32,6 +32,7 @@ namespace Espo\ORM\QueryComposer; use Espo\ORM\{ Query\LockTable as LockTableQuery, }; +use LogicException; class MysqlQueryComposer extends BaseQueryComposer { diff --git a/application/Espo/Repositories/Preferences.php b/application/Espo/Repositories/Preferences.php index c94e6d889a..689aad194c 100644 --- a/application/Espo/Repositories/Preferences.php +++ b/application/Espo/Repositories/Preferences.php @@ -49,6 +49,8 @@ class Preferences implements Repository, use Di\ConfigSetter; use Di\EntityManagerSetter; + protected $entityFactory; + public function __construct( EntityManager $entityManager, EntityFactory $entityFactory diff --git a/application/Espo/Services/ExternalAccount.php b/application/Espo/Services/ExternalAccount.php index 86844bd64b..4e4087db96 100644 --- a/application/Espo/Services/ExternalAccount.php +++ b/application/Espo/Services/ExternalAccount.php @@ -36,6 +36,7 @@ use Espo\Core\ExternalAccount\ClientManager; use Espo\Core\Exceptions\Error; use Espo\Core\Exceptions\NotFound; +use Espo\Core\Exceptions\NotFoundSilent; use Espo\Core\Exceptions\Forbidden; use Espo\Core\Record\ReadParams; diff --git a/application/Espo/Services/LeadCapture.php b/application/Espo/Services/LeadCapture.php index 7857ac8aea..4a052aff72 100644 --- a/application/Espo/Services/LeadCapture.php +++ b/application/Espo/Services/LeadCapture.php @@ -35,6 +35,7 @@ use Espo\{ }; use Espo\Core\{ + Exceptions\Forbidden, Exceptions\NotFound, Exceptions\Error, Utils\Util, diff --git a/application/Espo/Services/RecordTree.php b/application/Espo/Services/RecordTree.php index 54604dbe35..8875b4614a 100644 --- a/application/Espo/Services/RecordTree.php +++ b/application/Espo/Services/RecordTree.php @@ -35,6 +35,7 @@ use Espo\ORM\{ }; use Espo\Core\{ + Exceptions\NotFound, Exceptions\Error, Exceptions\Forbidden, Select\SearchParams, diff --git a/application/Espo/Services/Stream.php b/application/Espo/Services/Stream.php index e03c126acb..7992541d79 100644 --- a/application/Espo/Services/Stream.php +++ b/application/Espo/Services/Stream.php @@ -104,6 +104,8 @@ class Stream private $selectBuilderFactory; + private $userAclManagerProvider; + private $noteAccessControl; private $recordServiceContainer; diff --git a/application/Espo/Tools/FieldManager/FieldManager.php b/application/Espo/Tools/FieldManager/FieldManager.php index eeaa83f7ec..3f272736f6 100644 --- a/application/Espo/Tools/FieldManager/FieldManager.php +++ b/application/Espo/Tools/FieldManager/FieldManager.php @@ -30,6 +30,7 @@ namespace Espo\Tools\FieldManager; use Espo\Core\{ + Exceptions\BadRequest, Exceptions\Error, Exceptions\Conflict, Container, diff --git a/application/Espo/Tools/Import/Import.php b/application/Espo/Tools/Import/Import.php index 44e7d70612..5bbd7d48ea 100644 --- a/application/Espo/Tools/Import/Import.php +++ b/application/Espo/Tools/Import/Import.php @@ -94,6 +94,8 @@ class Import private $jobSchedulerFactory; + private $recordServiceContainer; + private $log; public function __construct( diff --git a/application/Espo/Tools/Pdf/PrinterController.php b/application/Espo/Tools/Pdf/PrinterController.php index 8883a428c1..ddb778c267 100644 --- a/application/Espo/Tools/Pdf/PrinterController.php +++ b/application/Espo/Tools/Pdf/PrinterController.php @@ -48,6 +48,8 @@ class PrinterController private $injectableFactory; + private $engine; + public function __construct( Metadata $metadata, InjectableFactory $injectableFactory,