From fbd496e663a1dc56ab3eec0d0d39ea67b6997822 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 27 Jun 2020 12:47:02 +0300 Subject: [PATCH] cs fixes --- .../Espo/Modules/Crm/Services/Account.php | 22 +++++++++---------- .../Espo/Modules/Crm/Services/Call.php | 6 +---- .../Espo/Modules/Crm/Services/Campaign.php | 8 +++---- .../Crm/Services/CampaignLogRecord.php | 3 --- .../Crm/Services/CampaignTrackingUrl.php | 4 ++-- .../Espo/Modules/Crm/Services/CaseObj.php | 3 +-- .../Espo/Modules/Crm/Services/Contact.php | 3 +-- .../Espo/Modules/Crm/Services/Document.php | 6 ++--- .../Modules/Crm/Services/DocumentFolder.php | 3 --- .../Crm/Services/KnowledgeBaseArticle.php | 8 +++---- .../Crm/Services/KnowledgeBaseCategory.php | 3 +-- .../Espo/Modules/Crm/Services/Lead.php | 6 ++--- .../Espo/Modules/Crm/Services/Meeting.php | 10 ++++----- .../Espo/Modules/Crm/Services/Opportunity.php | 6 ++--- .../Espo/Modules/Crm/Services/Target.php | 7 +++--- .../Espo/Modules/Crm/Services/Task.php | 6 ++--- 16 files changed, 44 insertions(+), 60 deletions(-) diff --git a/application/Espo/Modules/Crm/Services/Account.php b/application/Espo/Modules/Crm/Services/Account.php index e28709fb65..d82d4b986c 100644 --- a/application/Espo/Modules/Crm/Services/Account.php +++ b/application/Espo/Modules/Crm/Services/Account.php @@ -29,23 +29,23 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; +use Espo\ORM\Entity; class Account extends \Espo\Services\Record { - protected $linkSelectParams = array( - 'contacts' => array( - 'additionalColumns' => array( + protected $linkSelectParams = [ + 'contacts' => [ + 'additionalColumns' => [ 'role' => 'accountRole', 'isInactive' => 'accountIsInactive' - ) - ), - 'targetLists' => array( - 'additionalColumns' => array( + ] + ], + 'targetLists' => [ + 'additionalColumns' => [ 'optedOut' => 'isOptedOut' - ) - ) - ); + ] + ] + ]; protected function getDuplicateWhereClause(Entity $entity, $data) { diff --git a/application/Espo/Modules/Crm/Services/Call.php b/application/Espo/Modules/Crm/Services/Call.php index 97d5f2b715..cd46fa0248 100644 --- a/application/Espo/Modules/Crm/Services/Call.php +++ b/application/Espo/Modules/Crm/Services/Call.php @@ -29,10 +29,7 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; - -use \Espo\Core\Exceptions\Error; -use \Espo\Core\Exceptions\Forbidden; +use Espo\ORM\Entity; class Call extends Meeting { @@ -90,5 +87,4 @@ class Call extends Meeting $this->loadPhoneNumbersMapField($entity); } } - } diff --git a/application/Espo/Modules/Crm/Services/Campaign.php b/application/Espo/Modules/Crm/Services/Campaign.php index c79badd462..cabcd27a9b 100644 --- a/application/Espo/Modules/Crm/Services/Campaign.php +++ b/application/Espo/Modules/Crm/Services/Campaign.php @@ -29,11 +29,11 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; +use Espo\ORM\Entity; -use \Espo\Core\Exceptions\Error, - \Espo\Core\Exceptions\Forbidden, - \Espo\Core\Exceptions\BadRequest; +use Espo\Core\Exceptions\Error, + Espo\Core\Exceptions\Forbidden, + Espo\Core\Exceptions\BadRequest; class Campaign extends \Espo\Services\Record { diff --git a/application/Espo/Modules/Crm/Services/CampaignLogRecord.php b/application/Espo/Modules/Crm/Services/CampaignLogRecord.php index 3557d9daf0..4d8099f66e 100644 --- a/application/Espo/Modules/Crm/Services/CampaignLogRecord.php +++ b/application/Espo/Modules/Crm/Services/CampaignLogRecord.php @@ -29,9 +29,6 @@ namespace Espo\Modules\Crm\Services; -use \Espo\Core\Exceptions\Forbidden; -use \Espo\ORM\Entity; - class CampaignLogRecord extends \Espo\Services\Record { protected $forceSelectAllAttributes = true; diff --git a/application/Espo/Modules/Crm/Services/CampaignTrackingUrl.php b/application/Espo/Modules/Crm/Services/CampaignTrackingUrl.php index f32f0f4f1d..f8a54112b3 100644 --- a/application/Espo/Modules/Crm/Services/CampaignTrackingUrl.php +++ b/application/Espo/Modules/Crm/Services/CampaignTrackingUrl.php @@ -29,8 +29,8 @@ namespace Espo\Modules\Crm\Services; -use \Espo\Core\Exceptions\Forbidden; -use \Espo\ORM\Entity; +use Espo\Core\Exceptions\Forbidden; +use Espo\ORM\Entity; class CampaignTrackingUrl extends \Espo\Services\Record { diff --git a/application/Espo/Modules/Crm/Services/CaseObj.php b/application/Espo/Modules/Crm/Services/CaseObj.php index 7c0d3ad793..5469c03976 100644 --- a/application/Espo/Modules/Crm/Services/CaseObj.php +++ b/application/Espo/Modules/Crm/Services/CaseObj.php @@ -29,7 +29,7 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; +use Espo\ORM\Entity; class CaseObj extends \Espo\Services\Record { @@ -177,4 +177,3 @@ class CaseObj extends \Espo\Services\Record return $list; } } - diff --git a/application/Espo/Modules/Crm/Services/Contact.php b/application/Espo/Modules/Crm/Services/Contact.php index 81523937b8..5a5de45c24 100644 --- a/application/Espo/Modules/Crm/Services/Contact.php +++ b/application/Espo/Modules/Crm/Services/Contact.php @@ -29,11 +29,10 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; +use Espo\ORM\Entity; class Contact extends \Espo\Core\Templates\Services\Person { - protected $readOnlyAttributeList = [ 'inboundEmailId', 'portalUserId' diff --git a/application/Espo/Modules/Crm/Services/Document.php b/application/Espo/Modules/Crm/Services/Document.php index 6d3f08419c..4ee4523d4e 100644 --- a/application/Espo/Modules/Crm/Services/Document.php +++ b/application/Espo/Modules/Crm/Services/Document.php @@ -29,12 +29,11 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; -use \Espo\Core\Exceptions\NotFound; +use Espo\Core\Exceptions\NotFound; class Document extends \Espo\Services\Record { - public function getAttachmentList($id) + public function getAttachmentList(string $id) { $entity = $this->getEntity($id); @@ -60,4 +59,3 @@ class Document extends \Espo\Services\Record return $attachmentList; } } - diff --git a/application/Espo/Modules/Crm/Services/DocumentFolder.php b/application/Espo/Modules/Crm/Services/DocumentFolder.php index 6aa75c5f32..a999b9bdec 100644 --- a/application/Espo/Modules/Crm/Services/DocumentFolder.php +++ b/application/Espo/Modules/Crm/Services/DocumentFolder.php @@ -29,12 +29,9 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; - class DocumentFolder extends \Espo\Services\RecordTree { protected $subjectEntityType = 'Document'; protected $categoryField = 'folder'; - } diff --git a/application/Espo/Modules/Crm/Services/KnowledgeBaseArticle.php b/application/Espo/Modules/Crm/Services/KnowledgeBaseArticle.php index 61d0aeddcc..5191736934 100644 --- a/application/Espo/Modules/Crm/Services/KnowledgeBaseArticle.php +++ b/application/Espo/Modules/Crm/Services/KnowledgeBaseArticle.php @@ -29,11 +29,11 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; +use Espo\ORM\Entity; -use \Espo\Core\Exceptions\Forbidden; -use \Espo\Core\Exceptions\NotFound; -use \Espo\Core\Exceptions\Error; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\NotFound; +use Espo\Core\Exceptions\Error; class KnowledgeBaseArticle extends \Espo\Services\Record { diff --git a/application/Espo/Modules/Crm/Services/KnowledgeBaseCategory.php b/application/Espo/Modules/Crm/Services/KnowledgeBaseCategory.php index 21d8bed41e..995a5a7df1 100644 --- a/application/Espo/Modules/Crm/Services/KnowledgeBaseCategory.php +++ b/application/Espo/Modules/Crm/Services/KnowledgeBaseCategory.php @@ -29,12 +29,11 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; +use Espo\ORM\Entity; class KnowledgeBaseCategory extends \Espo\Services\RecordTree { protected $subjectEntityType = 'KnowledgeBaseArticle'; protected $categoryField = 'categories'; - } diff --git a/application/Espo/Modules/Crm/Services/Lead.php b/application/Espo/Modules/Crm/Services/Lead.php index 3941712227..ce9b133fd0 100644 --- a/application/Espo/Modules/Crm/Services/Lead.php +++ b/application/Espo/Modules/Crm/Services/Lead.php @@ -29,10 +29,10 @@ namespace Espo\Modules\Crm\Services; -use \Espo\Core\Exceptions\Error; -use \Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\Error; +use Espo\Core\Exceptions\Forbidden; -use \Espo\ORM\Entity; +use Espo\ORM\Entity; class Lead extends \Espo\Core\Templates\Services\Person { diff --git a/application/Espo/Modules/Crm/Services/Meeting.php b/application/Espo/Modules/Crm/Services/Meeting.php index 21e3027e0a..43ac3af9e6 100644 --- a/application/Espo/Modules/Crm/Services/Meeting.php +++ b/application/Espo/Modules/Crm/Services/Meeting.php @@ -29,12 +29,12 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; -use \Espo\Modules\Crm\Business\Event\Invitations; +use Espo\ORM\Entity; +use Espo\Modules\Crm\Business\Event\Invitations; -use \Espo\Core\Exceptions\Error; -use \Espo\Core\Exceptions\Forbidden; -use \Espo\Core\Exceptions\BadRequest; +use Espo\Core\Exceptions\Error; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\BadRequest; class Meeting extends \Espo\Services\Record { diff --git a/application/Espo/Modules/Crm/Services/Opportunity.php b/application/Espo/Modules/Crm/Services/Opportunity.php index ccdb8e2c93..43aa3132dd 100644 --- a/application/Espo/Modules/Crm/Services/Opportunity.php +++ b/application/Espo/Modules/Crm/Services/Opportunity.php @@ -29,10 +29,10 @@ namespace Espo\Modules\Crm\Services; -use \Espo\ORM\Entity; +use Espo\ORM\Entity; -use \Espo\Core\Exceptions\Error; -use \Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\Error; +use Espo\Core\Exceptions\Forbidden; class Opportunity extends \Espo\Services\Record { diff --git a/application/Espo/Modules/Crm/Services/Target.php b/application/Espo/Modules/Crm/Services/Target.php index f3f8ba1689..03c14f91a7 100644 --- a/application/Espo/Modules/Crm/Services/Target.php +++ b/application/Espo/Modules/Crm/Services/Target.php @@ -29,9 +29,9 @@ namespace Espo\Modules\Crm\Services; -use \Espo\Core\Exceptions\Error; -use \Espo\Core\Exceptions\Forbidden; -use \Espo\ORM\Entity; +use Espo\Core\Exceptions\Error; +use Espo\Core\Exceptions\Forbidden; +use Espo\ORM\Entity; class Target extends \Espo\Services\Record { @@ -91,4 +91,3 @@ class Target extends \Espo\Services\Record return $lead; } } - diff --git a/application/Espo/Modules/Crm/Services/Task.php b/application/Espo/Modules/Crm/Services/Task.php index befc45864f..e091d03ee6 100644 --- a/application/Espo/Modules/Crm/Services/Task.php +++ b/application/Espo/Modules/Crm/Services/Task.php @@ -29,10 +29,10 @@ namespace Espo\Modules\Crm\Services; -use \Espo\Core\Exceptions\Error; -use \Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\Error; +use Espo\Core\Exceptions\Forbidden; -use \Espo\ORM\Entity; +use Espo\ORM\Entity; class Task extends \Espo\Services\Record {