diff all patch versions

* Update EmailTemplate.json

https://forum.espocrm.com/forum/bug-reports/62259-tipos-in-emailtemplate-create

* Update EmailTemplate.json

https://forum.espocrm.com/forum/bug-reports/62259-tipos-in-emailtemplate-create

* Update EmailTemplate.json

https://forum.espocrm.com/forum/bug-reports/62259-tipos-in-emailtemplate-create

* Update EmailTemplate.json

* Update EmailTemplate.json

https://forum.espocrm.com/forum/bug-reports/62259-tipos-in-emailtemplate-create

Gruntfile.js

@@ -49,6 +49,7 @@ module.exports = function (grunt) {
         'client/lib/bull.js',
         'client/lib/marked.min.js',
         'client/lib/autobahn.js',
+        'client/lib/gridstack.all.js',
 
         'client/src/namespace.js',
         'client/src/exceptions.js',
@@ -211,6 +212,7 @@ module.exports = function (grunt) {
                     'daemon.php',
                     'rebuild.php',
                     'clear_cache.php',
+                    'preload.php',
                     'upgrade.php',
                     'extension.php',
                     'websocket.php',
@@ -288,8 +290,8 @@ module.exports = function (grunt) {
                 },
                 files: [
                     {
-                        src: 'build/tmp/application/Espo/Core/defaults/config.php',
-                        dest: 'build/tmp/application/Espo/Core/defaults/config.php'
+                        src: 'build/tmp/application/Espo/Resources/defaults/config.php',
+                        dest: 'build/tmp/application/Espo/Resources/defaults/config.php'
                     }
                 ]
             }
@@ -313,11 +315,11 @@ module.exports = function (grunt) {
     });
 
     grunt.registerTask("unit-tests-run", function() {
-        cp.execSync("vendor/bin/phpunit --bootstrap=./vendor/autoload.php tests/unit", {stdio: 'inherit'});
+        cp.execSync("vendor/bin/phpunit --bootstrap=./vendor/autoload.php ./tests/unit", {stdio: 'inherit'});
     });
 
     grunt.registerTask("integration-tests-run", function() {
-        cp.execSync("vendor/bin/phpunit --bootstrap=./vendor/autoload.php tests/integration", {stdio: 'inherit'});
+        cp.execSync("vendor/bin/phpunit --bootstrap=./vendor/autoload.php ./tests/integration", {stdio: 'inherit'});
     });
 
     grunt.registerTask("zip", function() {

api/v1/index.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 /************************************************************************
  * This file is part of EspoCRM.
  *
@@ -29,5 +29,9 @@
 
 require_once('../../bootstrap.php');
 
-$app = new \Espo\Core\Application();
-$app->run();
+use Espo\Core\{
+    Application,
+    ApplicationRunners\Api,
+};
+
+(new Application())->run(Api::class);

api/v1/portal-access/index.php

@@ -29,11 +29,15 @@
 
 require_once('../../../bootstrap.php');
 
+use Espo\Core\{
+    Portal\Application,
+    Portal\ApplicationRunners\Api,
+};
+
 if (!empty($_GET['portalId'])) {
     $portalId = $_GET['portalId'];
 } else {
     $portalId = explode('/', $_SERVER['REQUEST_URI'])[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
 }
 
-$app = new \Espo\Core\Portal\Application($portalId);
-$app->run();
+(new Application($portalId))->run(Api::class);

application/Espo/Acl/ActionHistoryRecord.php

@@ -29,14 +29,13 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class ActionHistoryRecord extends \Espo\Core\Acl\Base
+class ActionHistoryRecord extends \Espo\Core\Acl\Acl
 {
     public function checkIsOwner(EntityUser $user, Entity $entity)
     {
         return $entity->get('userId') === $user->id;
     }
 }
-

application/Espo/Acl/Attachment.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class Attachment extends \Espo\Core\Acl\Base
+class Attachment extends \Espo\Core\Acl\Acl
 {
     public function checkEntityRead(EntityUser $user, Entity $entity, $data)
     {
@@ -90,4 +90,3 @@ class Attachment extends \Espo\Core\Acl\Base
         return false;
     }
 }
-

application/Espo/Acl/Email.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class Email extends \Espo\Core\Acl\Base
+class Email extends \Espo\Core\Acl\Acl
 {
     protected $ownerUserIdAttribute = 'usersIds';
 

application/Espo/Acl/EmailAddress.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class EmailAddress extends \Espo\Core\Acl\Base
+class EmailAddress extends \Espo\Core\Acl\Acl
 {
     public function checkEditInEntity(EntityUser $user, Entity $entity, Entity $excludeEntity)
     {
@@ -62,4 +62,3 @@ class EmailAddress extends \Espo\Core\Acl\Base
         return !$isFobidden;
     }
 }
-

application/Espo/Acl/EmailFilter.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class EmailFilter extends \Espo\Core\Acl\Base
+class EmailFilter extends \Espo\Core\Acl\Acl
 {
     public function checkIsOwner(EntityUser $user, Entity $entity)
     {
@@ -53,4 +53,3 @@ class EmailFilter extends \Espo\Core\Acl\Base
         return;
     }
 }
-

application/Espo/Acl/Import.php

@@ -29,12 +29,11 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class Import extends \Espo\Core\Acl\Base
+class Import extends \Espo\Core\Acl\Acl
 {
-
     public function checkEntityRead(EntityUser $user, Entity $entity, $data)
     {
         if ($user->isAdmin()) return true;

application/Espo/Acl/Note.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class Note extends \Espo\Core\Acl\Base
+class Note extends \Espo\Core\Acl\Acl
 {
     protected $deleteThresholdPeriod = '1 month';
 

application/Espo/Acl/Notification.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class Notification extends \Espo\Core\Acl\Base
+class Notification extends \Espo\Core\Acl\Acl
 {
     public function checkIsOwner(EntityUser $user, Entity $entity)
     {
@@ -42,4 +42,3 @@ class Notification extends \Espo\Core\Acl\Base
         return false;
     }
 }
-

application/Espo/Acl/PhoneNumber.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class PhoneNumber extends \Espo\Core\Acl\Base
+class PhoneNumber extends \Espo\Core\Acl\Acl
 {
     public function checkEditInEntity(EntityUser $user, Entity $entity, Entity $excludeEntity)
     {

application/Espo/Acl/ScheduledJob.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class ScheduledJob extends \Espo\Core\Acl\Base
+class ScheduledJob extends \Espo\Core\Acl\Acl
 {
     public function checkEntityRead(EntityUser $user, Entity $entity, $data)
     {
@@ -58,4 +58,3 @@ class ScheduledJob extends \Espo\Core\Acl\Base
         return $this->checkEntity($user, $entity, $data, 'create');
     }
 }
-

application/Espo/Acl/Team.php

@@ -29,13 +29,15 @@
 
 namespace Espo\Acl;
 
-use \Espo\ORM\Entity;
+use Espo\ORM\Entity;
 
-class Team extends \Espo\Core\Acl\Base
+use Espo\Entities\User as UserEntity;
+
+class Team extends \Espo\Core\Acl\Acl
 {
-    public function checkInTeam(\Espo\Entities\User $user, Entity $entity)
+    public function checkInTeam(UserEntity $user, Entity $entity)
     {
         $userTeamIdList = $user->getLinkMultipleIdList('teams');
         return in_array($entity->id, $userTeamIdList);
     }
-}
+}

application/Espo/Acl/User.php

@@ -29,12 +29,12 @@
 
 namespace Espo\Acl;
 
-use \Espo\ORM\Entity;
-use \Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
 
-class User extends \Espo\Core\Acl\Base
+class User extends \Espo\Core\Acl\Acl
 {
-    public function checkIsOwner(\Espo\Entities\User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
     {
         return $user->id === $entity->id;
     }

application/Espo/Acl/Webhook.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User as EntityUser;
+use Espo\ORM\Entity;
 
-class Webhook extends \Espo\Core\Acl\Base
+class Webhook extends \Espo\Core\Acl\Acl
 {
     public function checkIsOwner(EntityUser $user, Entity $entity)
     {

application/Espo/Classes/AppParams/TemplateEntityTypeList.php

@@ -27,31 +27,44 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\AppParams;
+namespace Espo\Classes\AppParams;
 
-class TemplateEntityTypeList extends \Espo\Core\Injectable
+use Espo\Core\{
+    Acl,
+    Select\SelectManagerFactory,
+    ORM\EntityManager,
+};
+
+/**
+ * Returns a list of entity types for which a PDF template exists.
+ */
+class TemplateEntityTypeList
 {
-    protected function init()
+    protected $acl;
+    protected $selectManagerFactory;
+    protected $entityManager;
+
+    public function __construct(Acl $acl, SelectManagerFactory $selectManagerFactory, EntityManager $entityManager)
     {
-        $this->addDependency('acl');
-        $this->addDependency('selectManagerFactory');
-        $this->addDependency('entityManager');
+        $this->acl = $acl;
+        $this->selectManagerFactory = $selectManagerFactory;
+        $this->entityManager = $entityManager;
     }
 
     public function get()
     {
-        if (!$this->getInjection('acl')->checkScope('Template')) {
+        if (!$this->acl->checkScope('Template')) {
             return [];
         }
 
         $list = [];
 
-        $selectManager = $this->getInjection('selectManagerFactory')->create('Template');
+        $selectManager = $this->selectManagerFactory->create('Template');
 
         $selectParams = $selectManager->getEmptySelectParams();
         $selectManager->applyAccess($selectParams);
 
-        $templateList = $this->getInjection('entityManager')->getRepository('Template')
+        $templateList = $this->entityManager->getRepository('Template')
             ->select(['entityType'])
             ->groupBy(['entityType'])
             ->find($selectParams);

application/Espo/Classes/Cleanup/Reminders.php

@@ -27,42 +27,44 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Utils\Authentication;
+namespace Espo\Classes\Cleanup;
 
-use \Espo\Core\Utils\Config;
-use \Espo\Core\ORM\EntityManager;
-use \Espo\Core\Utils\Auth;
+use Espo\Core\{
+    Utils\Config,
+    ORM\EntityManager,
+};
 
-abstract class Base
+use DateTime;
+
+class Reminders
 {
     protected $config;
-
     protected $entityManager;
 
-    private $passwordHash;
-
     public function __construct(Config $config, EntityManager $entityManager)
     {
         $this->config = $config;
         $this->entityManager = $entityManager;
     }
 
-    protected function getConfig()
-    {
-        return $this->config;
-    }
+    protected $cleanupRemindersPeriod = '15 days';
 
-    protected function getEntityManager()
+    public function process()
     {
-        return $this->entityManager;
-    }
+        $period = '-' . $this->config->get('cleanupRemindersPeriod', $this->cleanupRemindersPeriod);
 
-    protected function getPasswordHash()
-    {
-        if (!isset($this->passwordHash)) {
-            $this->passwordHash = new \Espo\Core\Utils\PasswordHash($this->config);
-        }
+        $dt = new DateTime();
 
-        return $this->passwordHash;
+        $dt->modify($period);
+
+        $delete = $this->entityManager->getQueryBuilder()
+            ->delete()
+            ->from('Reminder')
+            ->where([
+                'remindAt<' => $dt->format('Y-m-d'),
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
     }
 }

application/Espo/Classes/Cleanup/WebhookQueue.php

@@ -27,33 +27,63 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Cleanup;
+namespace Espo\Classes\Cleanup;
 
-class WebhookQueue extends Base
+use Espo\Core\{
+    Utils\Config,
+    ORM\EntityManager,
+};
+
+use DateTime;
+
+class WebhookQueue
 {
     protected $cleanupWebhookQueuePeriod = '10 days';
 
+    protected $config;
+    protected $entityManager;
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
     public function process()
     {
-        $pdo = $this->getEntityManager()->getPDO();
+        $period = '-' . $this->config->get('cleanupWebhookQueuePeriod', $this->cleanupWebhookQueuePeriod);
+
+        $datetime = new DateTime();
 
-        $period = '-' . $this->getConfig()->get('cleanupWebhookQueuePeriod', $this->cleanupWebhookQueuePeriod);
-        $datetime = new \DateTime();
         $datetime->modify($period);
         $from = $datetime->format('Y-m-d H:i:s');
 
-        $query = "
-            DELETE FROM `webhook_queue_item`
-            WHERE
-                DATE(created_at) < ".$pdo->quote($from)." AND
-                (status <> 'Pending' OR deleted = 1)
-        ";
-        $pdo->query($query);
+        $query = $this->entityManager->getQueryBuilder()
+            ->delete()
+            ->from('WebhookQueueItem')
+            ->where([
+                'DATE:(createdAt)<' => $from,
+                'OR' => [
+                    'status!=' => 'Pending',
+                    'deleted' => true,
+                ],
+            ])
+            ->build();
 
-        $query = "
-            DELETE FROM `webhook_event_queue_item`
-            WHERE DATE(created_at) < ".$pdo->quote($from)." AND (is_processed = 1 OR deleted = 1)
-        ";
-        $pdo->query($query);
+        $this->entityManager->getQueryExecutor()->execute($query);
+
+        $query = $this->entityManager->getQueryBuilder()
+            ->delete()
+            ->from('WebhookEventQueueItem')
+            ->where([
+                'DATE:(createdAt)<' => $from,
+                'OR' => [
+                    'isProcessed' => true,
+                    'deleted' => true,
+                ],
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($query);
     }
 }

application/Espo/Classes/ConsoleCommands/Import.php

@@ -0,0 +1,138 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\ConsoleCommands;
+
+use Espo\Core\{
+    ServiceFactory,
+    Console\Commands\Command,
+};
+
+use Throwable;
+
+class Import implements Command
+{
+    protected $serviceFactory;
+
+    public function __construct(ServiceFactory $serviceFactory)
+    {
+        $this->serviceFactory = $serviceFactory;
+    }
+
+    public function run(array $options, array $flagList)
+    {
+        $id = $options['id'] ?? null;
+        $filePath = $options['file'] ?? null;
+        $paramsId = $options['paramsId'] ?? null;
+
+        $service = $this->serviceFactory->create('Import');
+
+        $forceResume = in_array('resume', $flagList);
+        $revert = in_array('revert', $flagList);
+
+        if (!$id && $filePath) {
+            if (!$paramsId) {
+                $this->out("You need to specify --params-id option.\n");
+
+                return;
+            }
+
+            if (!file_exists($filePath)) {
+                $this->out("File not found.\n");
+
+                return;
+            }
+
+            $contents = file_get_contents($filePath);
+
+            try {
+                $result = $service->importFileWithParamsId($contents, $paramsId);
+
+                $resultId = $result->id;
+                $countCreated = $result->countCreated;
+                $countUpdated = $result->countUpdated;
+            }
+            catch (Throwable $e) {
+                $this->out("Error occured: ".$e->getMessage()."\n");
+
+                return;
+            }
+
+            $this->out("Finished. Import ID: {$resultId}. Created: {$countCreated}. Updated: {$countUpdated}.\n");
+
+            return;
+        }
+
+        if ($id && $revert) {
+            $this->out("Reverting import...\n");
+
+            try {
+                $service->revert($id);
+            }
+            catch (Throwable $e) {
+                $this->out("Error occured: " . $e->getMessage() . "\n");
+
+                return;
+            }
+
+            $this->out("Finished.\n");
+
+            return;
+        }
+
+        if ($id) {
+            $this->out("Running import, this may take a while...\n");
+
+            try {
+                $result = $service->importById($id, true, $forceResume);
+            }
+            catch (Throwable $e) {
+                $this->out("Error occured: " . $e->getMessage() . "\n");
+
+                return;
+            }
+
+            $countCreated = $result->countCreated;
+            $countUpdated = $result->countUpdated;
+
+            $this->out("Finished. Created: {$countCreated}. Updated: {$countUpdated}.\n");
+
+            return;
+        }
+
+        $this->out("Not enough params passed.\n");
+
+        return;
+    }
+
+    protected function out($string)
+    {
+        fwrite(\STDOUT, $string);
+    }
+}

application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php

@@ -27,13 +27,15 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Utils\Layout\Defaults;
+namespace Espo\Classes\DefaultLayouts;
+
+use Espo\Core\Utils\Metadata;
 
 class DefaultSidePanelType
 {
     protected $metadata;
 
-    public function __construct(\Espo\Core\Utils\Metadata $metadata)
+    public function __construct(Metadata $metadata)
     {
         $this->metadata = $metadata;
     }

application/Espo/Classes/FieldValidators/ArrayIntType.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class ArrayIntType extends ArrayType
 {

application/Espo/Classes/FieldValidators/ArrayType.php

@@ -27,16 +27,18 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class ArrayType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    public function checkMaxCount(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMaxCount(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if (!$this->isNotEmpty($entity, $field)) return true;
         $list = $entity->get($field);
@@ -44,7 +46,7 @@ class ArrayType extends BaseType
         return true;
     }
 
-    public function checkArray(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkArray(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if (isset($data->$field) && $data->$field !== null && !is_array($data->$field)) {
             return false;
@@ -53,7 +55,7 @@ class ArrayType extends BaseType
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         if (!$entity->has($field) || $entity->get($field) === null) return false;
         $list = $entity->get($field);

application/Espo/Classes/FieldValidators/BaseType.php

@@ -27,33 +27,33 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-use \Espo\ORM\Entity;
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Utils\Metadata,
+    Utils\FieldUtil,
+};
 
 class BaseType
 {
-    private $metadata;
-    private $fieldManagerUtil;
+    protected $metadata;
+    protected $fieldUtil;
 
-    public function __construct(\Espo\Core\Utils\Metadata $metadata, \Espo\Core\Utils\FieldManagerUtil $fieldManagerUtil)
+    public function __construct(Metadata $metadata, FieldUtil $fieldUtil)
     {
         $this->metadata = $metadata;
-        $this->fieldManagerUtil = $fieldManagerUtil;
+        $this->fieldUtil = $fieldUtil;
     }
 
     protected function getActualAttributeList(Entity $entity, string $field) : array
     {
-        return $this->getFieldManagerUtil()->getActualAttributeList($entity->getEntityType(), $field);
+        return $this->fieldUtil->getActualAttributeList($entity->getEntityType(), $field);
     }
 
-    protected function getMetadata() : \Espo\Core\Utils\Metadata
+    protected function getMetadata() : Metadata
     {
         return $this->metadata;
     }
-
-    protected function getFieldManagerUtil() : \Espo\Core\Utils\FieldManagerUtil
-    {
-        return $this->fieldManagerUtil;
-    }
 }

application/Espo/Classes/FieldValidators/ChecklistType.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class ChecklistType extends ArrayType
 {

application/Espo/Classes/FieldValidators/CurrencyType.php

@@ -27,11 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class CurrencyType extends FloatType
 {
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return
             $entity->has($field) && $entity->get($field) !== null &&

application/Espo/Classes/FieldValidators/DateType.php

@@ -27,16 +27,18 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class DateType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== null;
     }

application/Espo/Classes/FieldValidators/DatetimeOptionalType.php

@@ -27,16 +27,18 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class DatetimeOptionalType extends DatetimeType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         if ($entity->has($field) && $entity->get($field) !== null) return true;
         if ($entity->has($field . 'Date') && $entity->get($field . 'Date') !== null) return true;

application/Espo/Classes/FieldValidators/DatetimeType.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class DatetimeType extends DateType
 {

application/Espo/Classes/FieldValidators/EmailType.php

@@ -27,11 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class EmailType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if ($this->isNotEmpty($entity, $field)) return true;
 
@@ -45,7 +47,7 @@ class EmailType extends BaseType
         return false;
     }
 
-    public function checkEmailAddress(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkEmailAddress(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if ($this->isNotEmpty($entity, $field)) {
             $address = $entity->get($field);
@@ -68,7 +70,7 @@ class EmailType extends BaseType
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== '' && $entity->get($field) !== null;
     }

application/Espo/Classes/FieldValidators/EnumType.php

@@ -27,16 +27,18 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class EnumType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== null;
     }

application/Espo/Classes/FieldValidators/FileType.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class FileType extends LinkType
 {

application/Espo/Classes/FieldValidators/FloatType.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class FloatType extends IntType
 {

application/Espo/Classes/FieldValidators/ImageType.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class ImageType extends FileType
 {

application/Espo/Classes/FieldValidators/IntType.php

@@ -27,30 +27,32 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class IntType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    public function checkMax(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMax(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if (!$this->isNotEmpty($entity, $field)) return true;
         if ($entity->get($field) > $validationValue) return false;
         return true;
     }
 
-    public function checkMin(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMin(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if (!$this->isNotEmpty($entity, $field)) return true;
         if ($entity->get($field) < $validationValue) return false;
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== null;
     }

application/Espo/Classes/FieldValidators/JsonArrayType.php

@@ -27,18 +27,20 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class JsonArrayType extends BaseType
 {
-    public function checkArray(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkArray(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if (!$entity->has($field) || $entity->get($field) === null) return true;
 
         return is_array($entity->get($field));
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         if (!$entity->has($field) || $entity->get($field) === null) return false;
         $list = $entity->get($field);

application/Espo/Classes/FieldValidators/LinkMultipleType.php

@@ -27,11 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class LinkMultipleType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return count($entity->getLinkMultipleIdList($field)) > 0;
     }

application/Espo/Classes/FieldValidators/LinkParentType.php

@@ -27,11 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class LinkParentType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         $idAttribute = $field . 'Id';
         $typeAttribute = $field . 'Type';

application/Espo/Classes/FieldValidators/LinkType.php

@@ -27,11 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class LinkType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         $idAttribute = $field . 'Id';
 

application/Espo/Classes/FieldValidators/MultiEnumType.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class MultiEnumType extends ArrayType
 {

application/Espo/Classes/FieldValidators/PersonNameType.php

@@ -27,11 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class PersonNameType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         $isEmpty = true;
         foreach ($this->getActualAttributeList($entity, $field) as $attribute) {

application/Espo/Classes/FieldValidators/PhoneType.php

@@ -27,11 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class PhoneType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if ($this->isNotEmpty($entity, $field)) return true;
 
@@ -45,7 +47,7 @@ class PhoneType extends BaseType
         return false;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== '' && $entity->get($field) !== null;
     }

application/Espo/Classes/FieldValidators/VarcharType.php

@@ -27,16 +27,18 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class VarcharType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    public function checkMaxLength(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMaxLength(Entity $entity, string $field, $validationValue, $data) : bool
     {
         if ($this->isNotEmpty($entity, $field)) {
             $value = $entity->get($field);
@@ -47,7 +49,7 @@ class VarcharType extends BaseType
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
     {
         return $entity->has($field) && $entity->get($field) !== '' && $entity->get($field) !== null;
     }

application/Espo/Classes/TemplateHelpers/GoogleMaps.php

@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\TemplateHelpers;
+namespace Espo\Classes\TemplateHelpers;
 
 class GoogleMaps
 {

application/Espo/Controllers/Admin.php

@@ -29,10 +29,12 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\NotFound;
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
+
+use Espo\Core\UpgradeManager;
+use Espo\Core\Utils\AdminNotificationManager;
+use Espo\Core\Utils\SystemRequirements;
 
 class Admin extends \Espo\Core\Controllers\Base
 {
@@ -48,15 +50,17 @@ class Admin extends \Espo\Core\Controllers\Base
         if (!$request->isPost()) {
             throw new BadRequest();
         }
-        $result = $this->getContainer()->get('dataManager')->rebuild();
 
-        return $result;
+        $this->getContainer()->get('dataManager')->rebuild();
+
+        return true;
     }
 
     public function postActionClearCache($params)
     {
-        $result = $this->getContainer()->get('dataManager')->clearCache();
-        return $result;
+        $this->getContainer()->get('dataManager')->clearCache();
+
+        return true;
     }
 
     public function actionJobs()
@@ -73,15 +77,16 @@ class Admin extends \Espo\Core\Controllers\Base
                 throw new Forbidden();
             }
         }
-        $upgradeManager = new \Espo\Core\UpgradeManager($this->getContainer());
+
+        $upgradeManager = new UpgradeManager($this->getContainer());
 
         $upgradeId = $upgradeManager->upload($data);
         $manifest = $upgradeManager->getManifest();
 
-        return array(
+        return [
             'id' => $upgradeId,
             'version' => $manifest['version'],
-        );
+        ];
     }
 
     public function postActionRunUpgrade($params, $data)
@@ -92,7 +97,7 @@ class Admin extends \Espo\Core\Controllers\Base
             }
         }
 
-        $upgradeManager = new \Espo\Core\UpgradeManager($this->getContainer());
+        $upgradeManager = new UpgradeManager($this->getContainer());
         $upgradeManager->install(get_object_vars($data));
 
         return true;
@@ -105,13 +110,15 @@ class Admin extends \Espo\Core\Controllers\Base
 
     public function actionAdminNotificationList($params)
     {
-        $adminNotificationManager = new \Espo\Core\Utils\AdminNotificationManager($this->getContainer());
+        $adminNotificationManager = new AdminNotificationManager($this->getContainer());
+
         return $adminNotificationManager->getNotificationList();
     }
 
     public function actionSystemRequirementList($params)
     {
-        $systemRequirementManager = new \Espo\Core\Utils\SystemRequirements($this->getContainer());
+        $systemRequirementManager = new SystemRequirements($this->getContainer());
+
         return $systemRequirementManager->getAllRequiredList();
     }
 }

application/Espo/Controllers/ApiIndex.php

@@ -0,0 +1,38 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+class ApiIndex {
+
+    public function getActionIndex()
+    {
+        return "EspoCRM REST API";
+    }
+}

application/Espo/Controllers/App.php

@@ -29,22 +29,33 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\BadRequest;
 
-class App extends \Espo\Core\Controllers\Base
+use Espo\Core\Authentication\Authentication;
+use Espo\Core\Di;
+use Espo\Core\Api\Request;
+
+use StdClass;
+
+class App implements
+
+    Di\ServiceFactoryAware,
+    Di\InjectableFactoryAware
 {
+    use Di\ServiceFactorySetter;
+    use Di\InjectableFactorySetter;
+
     public function actionUser()
     {
-        return $this->getServiceFactory()->create('App')->getUserData();
+        return $this->serviceFactory->create('App')->getUserData();
     }
 
-    public function postActionDestroyAuthToken($params, $data)
+    public function postActionDestroyAuthToken(array $params, StdClass $data, Request $request)
     {
         if (empty($data->token)) {
             throw new BadRequest();
         }
-
-        $auth = new \Espo\Core\Utils\Auth($this->getContainer());
-        return $auth->destroyAuthToken($data->token);
+        $auth = $this->injectableFactory->create(Authentication::class);
+        return $auth->destroyAuthToken($data->token, $request);
     }
 }

application/Espo/Controllers/Attachment.php

@@ -29,8 +29,8 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
 
 class Attachment extends \Espo\Core\Controllers\Record
 {
@@ -66,10 +66,10 @@ class Attachment extends \Espo\Core\Controllers\Record
 
         $fileData = $this->getRecordService()->getFileData($id);
 
-        $response->headers->set('Content-Type', $fileData->type);
-        $response->headers->set('Content-Disposition', 'Content-Disposition: attachment; filename="'.$fileData->name.'"');
+        $response->setHeader('Content-Type', $fileData->type);
+        $response->setHeader('Content-Disposition', 'Content-Disposition: attachment; filename="'.$fileData->name.'"');
         if ($fileData->size) {
-            $response->headers->set('Content-Length', $fileData->size);
+            $response->setHeader('Content-Length', $fileData->size);
         }
 
         return $fileData->contents;

application/Espo/Controllers/AuthLogRecord.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\Forbidden;
 
 class AuthLogRecord extends \Espo\Core\Controllers\Record
 {

application/Espo/Controllers/AuthToken.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\Forbidden;
 
 class AuthToken extends \Espo\Core\Controllers\Record
 {

application/Espo/Controllers/CurrencyRate.php

@@ -29,31 +29,34 @@
 
 namespace Espo\Controllers;
 
-use Espo\Core\Exceptions\Forbidden;
-use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\{
+    Forbidden,
+    BadRequest,
+};
 
-class CurrencyRate extends \Espo\Core\Controllers\Base
+use Espo\Core\{
+    ServiceFactory,
+    Api\Request,
+};
+
+class CurrencyRate
 {
-    protected function checkControllerAccess()
+    protected $serviceFactory;
+
+    public function __construct(ServiceFactory $serviceFactory)
     {
-        if (!$this->getAcl()->check('Currency')) {
-            throw new Forbidden();
-        }
+        $this->serviceFactory = $serviceFactory;
     }
 
-    public function getActionIndex()
+    public function getActionIndex(Request $request)
     {
-        if ($this->getAcl()->getLevel('Currency', 'read') !== 'yes') throw new Forbidden();
-
-        return $this->getService('CurrencyRate')->get();
+        return $this->serviceFactory->create('CurrencyRate')->get();
     }
 
-    public function putActionUpdate($params, $data)
+    public function putActionUpdate(Request $request)
     {
-        if ($this->getAcl()->getLevel('Currency', 'edit') !== 'yes') throw new Forbidden();
+        $data = $request->getParsedBody();
 
-        if (empty($data) || !is_object($data)) throw new BadRequest();
-
-        return $this->getService('CurrencyRate')->set($data);
+        return $this->serviceFactory->create('CurrencyRate')->set($data);
     }
 }

application/Espo/Controllers/DashboardTemplate.php

@@ -29,8 +29,8 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
 
 class DashboardTemplate extends \Espo\Core\Controllers\Record
 {

application/Espo/Controllers/DataPrivacy.php

@@ -29,27 +29,33 @@
 
 namespace Espo\Controllers;
 
-use Espo\Core\Exceptions\Error;
 use Espo\Core\Exceptions\Forbidden;
-use Espo\Core\Exceptions\NotFound;
 use Espo\Core\Exceptions\BadRequest;
 
-class DataPrivacy extends \Espo\Core\Controllers\Base
+use Espo\Core\ServiceFactory;
+use Espo\Core\Acl;
+
+class DataPrivacy
 {
-    protected function checkControllerAccess()
+    protected $serviceFactory;
+    protected $acl;
+
+    public function __construct(ServiceFactory $serviceFactory, Acl $acl)
     {
-        if ($this->getAcl()->get('dataPrivacyPermission') === 'no') {
+        $this->serviceFactory = $serviceFactory;
+        $this->acl = $acl;
+
+        if ($this->acl->get('dataPrivacyPermission') === 'no') {
             throw new Forbidden();
         }
     }
 
-    public function postActionErase($params, $data)
+    public function postActionErase($params, \StdClass $data)
     {
         if (empty($data->entityType) || empty($data->id) || empty($data->fieldList) || !is_array($data->fieldList)) {
             throw new BadRequest();
         }
 
-        return $this->getServiceFactory()->create('DataPrivacy')->erase($data->entityType, $data->id, $data->fieldList);
+        return $this->serviceFactory->create('DataPrivacy')->erase($data->entityType, $data->id, $data->fieldList);
     }
-
 }

application/Espo/Controllers/Email.php

@@ -29,10 +29,9 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\BadRequest;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\NotFound;
+use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\NotFound;
 
 class Email extends \Espo\Core\Controllers\Record
 {
@@ -230,4 +229,15 @@ class Email extends \Espo\Core\Controllers\Record
         }
         return $this->getRecordService()->moveToFolderByIdList($idList, $data->folderId);
     }
+
+    public function getActionGetInsertFieldData($params, $data, $request)
+    {
+        if (!$this->getAcl()->checkScope('Email', 'create')) throw new Forbidden();
+
+        return $this->getServiceFactory()->create('EmailTemplate')->getInsertFieldData([
+            'parentId' => $request->get('parentId'),
+            'parentType' => $request->get('parentType'),
+            'to' => $request->get('to'),
+        ]);
+    }
 }

application/Espo/Controllers/EmailAccount.php

@@ -29,8 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\Exceptions\Error;
 
 class EmailAccount extends \Espo\Core\Controllers\Record
@@ -40,7 +39,7 @@ class EmailAccount extends \Espo\Core\Controllers\Record
         return $this->getRecordService()->getFolders([
             'host' => $data->host ?? null,
             'port' => $data->port ?? null,
-            'ssl' =>  $data->ssl ?? false,
+            'security' =>  $data->security ?? null,
             'username' => $data->username ?? null,
             'password' => $data->password ?? null,
             'id' => $data->id ?? null,

application/Espo/Controllers/EmailAddress.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\Forbidden;
 
 class EmailAddress extends \Espo\Core\Controllers\Record
 {

application/Espo/Controllers/EmailFilter.php

@@ -33,4 +33,3 @@ class EmailFilter extends \Espo\Core\Controllers\Record
 {
 
 }
-

application/Espo/Controllers/EmailFolder.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\BadRequest;
 
 class EmailFolder extends \Espo\Core\Controllers\Record
 {

application/Espo/Controllers/EmailTemplate.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Error;
 
 class EmailTemplate extends \Espo\Core\Controllers\Record
 {
@@ -49,6 +49,4 @@ class EmailTemplate extends \Espo\Core\Controllers\Record
             'relatedId' => $request->get('relatedId')
         ), true);
     }
-
 }
-

application/Espo/Controllers/EntityManager.php

@@ -29,26 +29,49 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\BadRequest;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\Error;
+use Espo\{
+    Entities\User,
+    Tools\EntityManager\EntityManager as EntityManagerTool,
+};
 
-class EntityManager extends \Espo\Core\Controllers\Base
+use Espo\Core\{
+    Exceptions\Error,
+    Exceptions\Forbidden,
+    Exceptions\BadRequest,
+    Api\Request,
+    DataManager,
+    Utils\Config,
+};
+
+class EntityManager
 {
+    protected $user;
+    protected $dataManager;
+    protected $config;
+    protected $entityManagerTool;
+
+    public function __construct(User $user, DataManager $dataManager, Config $config, EntityManagerTool $entityManagerTool)
+    {
+        $this->user = $user;
+        $this->dataManager = $dataManager;
+        $this->config = $config;
+        $this->entityManagerTool = $entityManagerTool;
+
+        $this->checkControllerAccess();
+    }
+
     protected function checkControllerAccess()
     {
-        if (!$this->getUser()->isAdmin()) {
+        if (!$this->user->isAdmin()) {
             throw new Forbidden();
         }
     }
 
-    public function actionCreateEntity($params, $data, $request)
+    public function postActionCreateEntity(Request $request)
     {
-        $data = get_object_vars($data);
+        $data = $request->getParsedBody();
 
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $data = get_object_vars($data);
 
         if (empty($data['name']) || empty($data['type'])) {
             throw new BadRequest();
@@ -101,18 +124,18 @@ class EntityManager extends \Espo\Core\Controllers\Base
             $params['kanbanStatusIgnoreList'] = $data['kanbanStatusIgnoreList'];
         }
 
-        $result = $this->getContainer()->get('entityManagerUtil')->create($name, $type, $params);
+        $result = $this->entityManagerTool->create($name, $type, $params);
 
         if ($result) {
-            $tabList = $this->getConfig()->get('tabList', []);
+            $tabList = $this->config->get('tabList', []);
 
             if (!in_array($name, $tabList)) {
                 $tabList[] = $name;
-                $this->getConfig()->set('tabList', $tabList);
-                $this->getConfig()->save();
+                $this->config->set('tabList', $tabList);
+                $this->config->save();
             }
 
-            $this->getContainer()->get('dataManager')->rebuild();
+            $this->dataManager->rebuild();
         } else {
             throw new Error();
         }
@@ -120,23 +143,23 @@ class EntityManager extends \Espo\Core\Controllers\Base
         return true;
     }
 
-    public function actionUpdateEntity($params, $data, $request)
+    public function postActionUpdateEntity(Request $request)
     {
+        $data = $request->getParsedBody();
+
         $data = get_object_vars($data);
 
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
         if (empty($data['name'])) {
             throw new BadRequest();
         }
+
         $name = $data['name'];
         $name = filter_var($name, \FILTER_SANITIZE_STRING);
 
-        $result = $this->getContainer()->get('entityManagerUtil')->update($name, $data);
+        $result = $this->entityManagerTool->update($name, $data);
 
         if ($result) {
-            $this->getContainer()->get('dataManager')->clearCache();
+            $this->dataManager->clearCache();
         } else {
             throw new Error();
         }
@@ -144,32 +167,31 @@ class EntityManager extends \Espo\Core\Controllers\Base
         return true;
     }
 
-    public function actionRemoveEntity($params, $data, $request)
+    public function postActionRemoveEntity(Request $request)
     {
-        $data = get_object_vars($data);
+        $data = $request->getParsedBody();
 
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $data = get_object_vars($data);
 
         if (empty($data['name'])) {
             throw new BadRequest();
         }
+
         $name = $data['name'];
         $name = filter_var($name, \FILTER_SANITIZE_STRING);
 
-        $result = $this->getContainer()->get('entityManagerUtil')->delete($name);
+        $result = $this->entityManagerTool->delete($name);
 
         if ($result) {
-            $tabList = $this->getConfig()->get('tabList', []);
+            $tabList = $this->config->get('tabList', []);
             if (($key = array_search($name, $tabList)) !== false) {
                 unset($tabList[$key]);
                 $tabList = array_values($tabList);
             }
-            $this->getConfig()->set('tabList', $tabList);
-            $this->getConfig()->save();
+            $this->config->set('tabList', $tabList);
+            $this->config->save();
 
-            $this->getContainer()->get('dataManager')->clearCache();
+            $this->dataManager->clearCache();
         } else {
             throw new Error();
         }
@@ -177,13 +199,11 @@ class EntityManager extends \Espo\Core\Controllers\Base
         return true;
     }
 
-    public function actionCreateLink($params, $data, $request)
+    public function postActionCreateLink(Request $request)
     {
-        $data = get_object_vars($data);
+        $data = $request->getParsedBody();
 
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $data = get_object_vars($data);
 
         $paramList = [
         	'entity',
@@ -234,10 +254,10 @@ class EntityManager extends \Espo\Core\Controllers\Base
             $params['foreignLinkEntityTypeList'] = $data['foreignLinkEntityTypeList'];
         }
 
-        $result = $this->getContainer()->get('entityManagerUtil')->createLink($params);
+        $result = $this->entityManagerTool->createLink($params);
 
         if ($result) {
-            $this->getContainer()->get('dataManager')->rebuild();
+            $this->dataManager->rebuild();
         } else {
             throw new Error();
         }
@@ -245,13 +265,11 @@ class EntityManager extends \Espo\Core\Controllers\Base
         return true;
     }
 
-    public function actionUpdateLink($params, $data, $request)
+    public function postActionUpdateLink(Request $request)
     {
-        $data = get_object_vars($data);
+        $data = $request->getParsedBody();
 
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $data = get_object_vars($data);
 
         $paramList = [
         	'entity',
@@ -295,10 +313,10 @@ class EntityManager extends \Espo\Core\Controllers\Base
             $params['foreignLinkEntityTypeList'] = $data['foreignLinkEntityTypeList'];
         }
 
-        $result = $this->getContainer()->get('entityManagerUtil')->updateLink($params);
+        $result = $this->entityManagerTool->updateLink($params);
 
         if ($result) {
-            $this->getContainer()->get('dataManager')->clearCache();
+            $this->dataManager->clearCache();
         } else {
             throw new Error();
         }
@@ -306,27 +324,27 @@ class EntityManager extends \Espo\Core\Controllers\Base
         return true;
     }
 
-    public function actionRemoveLink($params, $data, $request)
+    public function postActionRemoveLink(Request $request)
     {
-        $data = get_object_vars($data);
+        $data = $request->getParsedBody();
 
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $data = get_object_vars($data);
 
         $paramList = [
         	'entity',
         	'link',
         ];
-        $d = array();
+
+        $d = [];
+
         foreach ($paramList as $item) {
         	$d[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
         }
 
-        $result = $this->getContainer()->get('entityManagerUtil')->deleteLink($d);
+        $result = $this->entityManagerTool->deleteLink($d);
 
         if ($result) {
-            $this->getContainer()->get('dataManager')->clearCache();
+            $this->dataManager->clearCache();
         } else {
             throw new Error();
         }
@@ -334,32 +352,37 @@ class EntityManager extends \Espo\Core\Controllers\Base
         return true;
     }
 
-    public function postActionFormula($params, $data, $request)
+    public function postActionFormula(Request $request)
     {
+        $data = $request->getParsedBody();
+
         if (empty($data->scope)) {
             throw new BadRequest();
         }
+
         if (!property_exists($data, 'data')) {
             throw new BadRequest();
         }
 
         $formulaData = get_object_vars($data->data);
 
-        $this->getContainer()->get('entityManagerUtil')->setFormulaData($data->scope, $formulaData);
+        $this->entityManagerTool->setFormulaData($data->scope, $formulaData);
 
-        $this->getContainer()->get('dataManager')->clearCache();
+        $this->dataManager->clearCache();
 
         return true;
     }
 
-    public function postActionResetToDefault($params, $data, $request)
+    public function postActionResetToDefault(Request $request)
     {
+        $data = $request->getParsedBody();
+
         if (empty($data->scope)) {
             throw new BadRequest();
         }
 
-        $this->getContainer()->get('entityManagerUtil')->resetToDefaults($data->scope);
-        $this->getContainer()->get('dataManager')->clearCache();
+        $this->entityManagerTool->resetToDefaults($data->scope);
+        $this->dataManager->clearCache();
 
         return true;
     }

application/Espo/Controllers/Extension.php

@@ -29,8 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\Forbidden;
 
 class Extension extends \Espo\Core\Controllers\Record
 {

application/Espo/Controllers/ExternalAccount.php

@@ -29,9 +29,9 @@
 
 namespace Espo\Controllers;
 
-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 ExternalAccount extends \Espo\Core\Controllers\Record
 {

application/Espo/Controllers/FieldManager.php

@@ -29,27 +29,52 @@
 
 namespace Espo\Controllers;
 
-use Espo\Core\Exceptions\Error;
-use Espo\Core\Exceptions\Forbidden;
-use Espo\Core\Exceptions\NotFound;
-use Espo\Core\Exceptions\BadRequest;
+use Espo\{
+    Entities\User,
+    Tools\FieldManager\FieldManager as FieldManagerTool,
+};
 
-class FieldManager extends \Espo\Core\Controllers\Base
+use Espo\Core\{
+    Exceptions\Error,
+    Exceptions\Forbidden,
+    Exceptions\NotFound,
+    Exceptions\BadRequest,
+    Api\Request,
+    DataManager,
+};
+
+class FieldManager
 {
+    protected $user;
+    protected $dataManager;
+    protected $fieldManagerTool;
+
+    public function __construct(User $user, DataManager $dataManager, FieldManagerTool $fieldManagerTool)
+    {
+        $this->user = $user;
+        $this->dataManager = $dataManager;
+        $this->fieldManagerTool = $fieldManagerTool;
+
+        $this->checkControllerAccess();
+    }
+
     protected function checkControllerAccess()
     {
-        if (!$this->getUser()->isAdmin()) {
+        if (!$this->user->isAdmin()) {
             throw new Forbidden();
         }
     }
 
-    public function actionRead($params, $data)
+    public function getActionRead(Request $request)
     {
-        if (empty($params['scope']) || empty($params['name'])) {
+        $scope = $request->getRouteParam('scope');
+        $name = $request->getRouteParam('name');
+
+        if (!$scope || !$name) {
             throw new BadRequest();
         }
 
-        $data = $this->getContainer()->get('fieldManager')->read($params['scope'], $params['name']);
+        $data = $this->fieldManagerTool->read($scope, $name);
 
         if (!isset($data)) {
             throw new BadRequest();
@@ -58,72 +83,91 @@ class FieldManager extends \Espo\Core\Controllers\Base
         return $data;
     }
 
-    public function postActionCreate($params, $data)
+    public function postActionCreate(Request $request)
     {
-        if (empty($params['scope']) || empty($data->name)) {
+        $data = $request->getParsedBody();
+
+        $scope = $request->getRouteParam('scope');
+        $name = $data->name ?? null;
+
+        if (!$scope || !$name) {
             throw new BadRequest();
         }
 
-        $fieldManager = $this->getContainer()->get('fieldManager');
-        $fieldManager->create($params['scope'], $data->name, get_object_vars($data));
+        $fieldManagerTool = $this->fieldManagerTool;
+
+        $fieldManagerTool->create($scope, $name, get_object_vars($data));
 
         try {
-            $this->getContainer()->get('dataManager')->rebuild($params['scope']);
-        } catch (Error $e) {
-            $fieldManager->delete($params['scope'], $data->name);
+            $this->dataManager->rebuild([$scope]);
+        }
+        catch (Error $e) {
+            $fieldManagerTool->delete($scope, $data->name);
+
             throw new Error($e->getMessage());
         }
 
-        return $fieldManager->read($params['scope'], $data->name);
+        return $fieldManagerTool->read($scope, $data->name);
     }
 
-    public function patchActionUpdate($params, $data)
+    public function patchActionUpdate(Request $request)
     {
-        return $this->putActionUpdate($params, $data);
+        return $this->putActionUpdate($request);
     }
 
-    public function putActionUpdate($params, $data)
+    public function putActionUpdate(Request $request)
     {
-        if (empty($params['scope']) || empty($params['name'])) {
+        $data = $request->getParsedBody();
+
+        $scope = $request->getRouteParam('scope');
+        $name = $request->getRouteParam('name');
+
+        if (!$scope || !$name) {
             throw new BadRequest();
         }
 
-        $fieldManager = $this->getContainer()->get('fieldManager');
-        $fieldManager->update($params['scope'], $params['name'], get_object_vars($data));
+        $fieldManagerTool = $this->fieldManagerTool;
 
-        if ($fieldManager->isChanged()) {
-            $this->getContainer()->get('dataManager')->rebuild($params['scope']);
+        $fieldManagerTool->update($scope, $name, get_object_vars($data));
+
+        if ($fieldManagerTool->isChanged()) {
+            $this->dataManager->rebuild([$scope]);
         } else {
-            $this->getContainer()->get('dataManager')->clearCache();
+            $this->dataManager->clearCache();
         }
 
-        return $fieldManager->read($params['scope'], $params['name']);
+        return $fieldManagerTool->read($scope, $name);
     }
 
-    public function deleteActionDelete($params, $data)
+    public function deleteActionDelete(Request $request)
     {
-        if (empty($params['scope']) || empty($params['name'])) {
+        $scope = $request->getRouteParam('scope');
+        $name = $request->getRouteParam('name');
+
+        if (!$scope || !$name) {
             throw new BadRequest();
         }
 
-        $result = $this->getContainer()->get('fieldManager')->delete($params['scope'], $params['name']);
+        $result = $this->fieldManagerTool->delete($scope, $name);
 
-        $this->getContainer()->get('dataManager')->rebuildMetadata();
+        $this->dataManager->rebuildMetadata();
 
         return $result;
     }
 
-    public function postActionResetToDefault($params, $data)
+    public function postActionResetToDefault(Request $request)
     {
+        $data = $request->getParsedBody();
+
         if (empty($data->scope) || empty($data->name)) {
             throw new BadRequest();
         }
 
-        $this->getContainer()->get('fieldManager')->resetToDefault($data->scope, $data->name);
+        $this->fieldManagerTool->resetToDefault($data->scope, $data->name);
 
-        $this->getContainer()->get('dataManager')->clearCache();
+        $this->dataManager->clearCache();
 
-        $this->getContainer()->get('dataManager')->rebuildMetadata();
+        $this->dataManager->rebuildMetadata();
 
         return true;
     }

application/Espo/Controllers/GlobalSearch.php

@@ -29,11 +29,17 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error,
-    \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\ServiceFactory;
 
-class GlobalSearch extends \Espo\Core\Controllers\Base
+class GlobalSearch
 {
+    protected $serviceFactory;
+
+    public function __construct(ServiceFactory $serviceFactory)
+    {
+        $this->serviceFactory = $serviceFactory;
+    }
+
     public function actionSearch($params, $data, $request)
     {
         $query = $request->get('q');
@@ -41,7 +47,6 @@ class GlobalSearch extends \Espo\Core\Controllers\Base
         $offset = intval($request->get('offset'));
         $maxSize = intval($request->get('maxSize'));
 
-        return $this->getService('GlobalSearch')->find($query, $offset, $maxSize);
+        return $this->serviceFactory->create('GlobalSearch')->find($query, $offset, $maxSize);
     }
 }
-

application/Espo/Controllers/I18n.php

@@ -29,17 +29,21 @@
 
 namespace Espo\Controllers;
 
-class I18n extends \Espo\Core\Controllers\Base
+use Espo\Core\ServiceFactory;
+
+class I18n
 {
+    protected $serviceFactory;
+
+    public function __construct(ServiceFactory $serviceFactory)
+    {
+        $this->serviceFactory = $serviceFactory;
+    }
+
     public function actionRead($params, $data, $request)
     {
         $default = $request->get('default') === 'true';
 
-        return $this->getServiceFactory()->create('Language')->getDataForFrontend($default);
-
-        /*if ($request->get('default')) {
-            return $this->getContainer()->get('defaultLanguage')->getAll();
-        }
-        return $this->getContainer()->get('language')->getAll();*/
+        return $this->serviceFactory->create('Language')->getDataForFrontend($default);
     }
 }

application/Espo/Controllers/Import.php

@@ -30,9 +30,9 @@
 namespace Espo\Controllers;
 
 use Espo\Core\Utils as Utils;
-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 Import extends \Espo\Core\Controllers\Record
 {
@@ -78,24 +78,13 @@ class Import extends \Espo\Core\Controllers\Record
         return $this->getContainer()->get('entityManager');
     }
 
-    public function actionUploadFile($params, $data, $request)
+    public function postActionUploadFile($params, $data)
     {
         $contents = $data;
 
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $attachmentId = $this->getService('Import')->uploadFile($contents);
 
-        $attachment = $this->getEntityManager()->getEntity('Attachment');
-        $attachment->set('type', 'text/csv');
-        $attachment->set('role', 'Import File');
-        $attachment->set('name', 'import-file.csv');
-        $attachment->set('contents', $contents);
-        $this->getEntityManager()->saveEntity($attachment);
-
-        return [
-            'attachmentId' => $attachment->id
-        ];
+        return ['attachmentId' => $attachmentId];
     }
 
     public function actionRevert($params, $data, $request)
@@ -106,7 +95,9 @@ class Import extends \Espo\Core\Controllers\Record
         if (!$request->isPost()) {
             throw new BadRequest();
         }
-        return $this->getService('Import')->revert($data->id);
+        $this->getService('Import')->revert($data->id);
+
+        return true;
     }
 
     public function actionRemoveDuplicates($params, $data, $request)
@@ -117,7 +108,9 @@ class Import extends \Espo\Core\Controllers\Record
         if (!$request->isPost()) {
             throw new BadRequest();
         }
-        return $this->getService('Import')->removeDuplicates($data->id);
+        $this->getService('Import')->removeDuplicates($data->id);
+
+        return true;
     }
 
     public function actionCreate($params, $data, $request)
@@ -190,6 +183,8 @@ class Import extends \Espo\Core\Controllers\Record
             'skipDuplicateChecking' => !empty($data->skipDuplicateChecking),
             'idleMode' => !empty($data->idleMode),
             'silentMode' => !empty($data->silentMode),
+            'manualMode' => !empty($data->manualMode),
+            'defaultFieldList' => $data->defaultFieldList ?? [],
         ];
 
         if (property_exists($data, 'updateBy')) {
@@ -210,7 +205,9 @@ class Import extends \Espo\Core\Controllers\Record
         if (empty($data->id) || empty($data->entityType) || empty($data->entityId)) {
             throw new BadRequest();
         }
+
         $this->getService('Import')->unmarkAsDuplicate($data->id, $data->entityType, $data->entityId);
+
         return true;
     }
 }

application/Espo/Controllers/InboundEmail.php

@@ -29,8 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
 
 class InboundEmail extends \Espo\Core\Controllers\Record
 {
@@ -46,7 +45,7 @@ class InboundEmail extends \Espo\Core\Controllers\Record
         return $this->getRecordService()->getFolders([
             'host' => $data->host ?? null,
             'port' => $data->port ?? null,
-            'ssl' =>  $data->ssl ?? false,
+            'security' =>  $data->security ?? null,
             'username' => $data->username ?? null,
             'password' => $data->password ?? null,
             'id' => $data->id ?? null,

application/Espo/Controllers/Integration.php

@@ -29,9 +29,8 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
 
 class Integration extends \Espo\Core\Controllers\Record
 {
@@ -82,4 +81,3 @@ class Integration extends \Espo\Core\Controllers\Record
         return $entity->toArray();
     }
 }
-

application/Espo/Controllers/Job.php

@@ -29,8 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\Forbidden;
 
 class Job extends \Espo\Core\Controllers\Record
 {

application/Espo/Controllers/LabelManager.php

@@ -29,49 +29,69 @@
 
 namespace Espo\Controllers;
 
-use Espo\Core\Utils as Utils;
-use \Espo\Core\Exceptions\NotFound;
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\{
+    Exceptions\Forbidden,
+    Exceptions\BadRequest,
+    Api\Request,
+    DataManager,
+};
 
-class LabelManager extends \Espo\Core\Controllers\Base
+use Espo\{
+    Tools\LabelManager\LabelManager as LabelManagerTool,
+    Entities\User,
+};
+
+class LabelManager
 {
+    protected $user;
+    protected $dataManager;
+    protected $labelManagerTool;
+
+    public function __construct(User $user, DataManager $dataManager, LabelManagerTool $labelManagerTool)
+    {
+        $this->user = $user;
+        $this->dataManager = $dataManager;
+        $this->labelManagerTool = $labelManagerTool;
+
+        $this->checkControllerAccess();
+    }
+
     protected function checkControllerAccess()
     {
-        if (!$this->getUser()->isAdmin()) {
+        if (!$this->user->isAdmin()) {
             throw new Forbidden();
         }
     }
 
-    public function postActionGetScopeList($params)
+    public function postActionGetScopeList()
     {
-        $labelManager = $this->getContainer()->get('injectableFactory')->createByClassName('\\Espo\\Core\\Utils\\LabelManager');
-
-        return $labelManager->getScopeList();
+        return $this->labelManagerTool->getScopeList();
     }
 
-    public function postActionGetScopeData($params, $data, $request)
+    public function postActionGetScopeData(Request $request)
     {
+        $data = $request->getParsedBody();
+
         if (empty($data->scope) || empty($data->language)) {
             throw new BadRequest();
         }
-        $labelManager = $this->getContainer()->get('injectableFactory')->createByClassName('\\Espo\\Core\\Utils\\LabelManager');
-        return $labelManager->getScopeData($data->language, $data->scope);
+
+        return $this->labelManagerTool->getScopeData($data->language, $data->scope);
     }
 
-    public function postActionSaveLabels($params, $data)
+    public function postActionSaveLabels(Request $request)
     {
+        $data = $request->getParsedBody();
+
         if (empty($data->scope) || empty($data->language) || !isset($data->labels)) {
             throw new BadRequest();
         }
 
         $labels = get_object_vars($data->labels);
 
-        $labelManager = $this->getContainer()->get('injectableFactory')->createByClassName('\\Espo\\Core\\Utils\\LabelManager');
-        $returnData = $labelManager->saveLabels($data->language, $data->scope, $labels);
+        $returnData = $this->labelManagerTool->saveLabels($data->language, $data->scope, $labels);
 
-        $this->getContainer()->get('dataManager')->clearCache();
+        $this->dataManager->clearCache();
 
         return $returnData;
     }

application/Espo/Controllers/LastViewed.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\Forbidden;
 
 class LastViewed extends \Espo\Core\Controllers\Base
 {

application/Espo/Controllers/Layout.php

@@ -47,6 +47,8 @@ class Layout extends \Espo\Core\Controllers\Base
 
     public function putActionUpdate($params, $data, $request)
     {
+        $data = json_decode($request->getBodyContents());
+
         if (is_object($data)) $data = get_object_vars($data);
 
         if (!$this->getUser()->isAdmin()) throw new Forbidden();

application/Espo/Controllers/LeadCapture.php

@@ -29,26 +29,36 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
-use \Espo\Core\Exceptions\NotFound;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\NotFound;
 
 class LeadCapture extends \Espo\Core\Controllers\Record
 {
     public function postActionLeadCapture($params, $data, $request, $response)
     {
-        if (empty($params['apiKey'])) throw new BadRequest('No API key provided.');
-        if (empty($data)) throw new BadRequest('No payload provided.');
+        if (empty($params['apiKey'])) {
+            throw new BadRequest('No API key provided.');
+        }
+
+        if (empty($data)) {
+            throw new BadRequest('No payload provided.');
+        }
 
         $allowOrigin = $this->getConfig()->get('leadCaptureAllowOrigin', '*');
-        $response->headers->set('Access-Control-Allow-Origin', $allowOrigin);
 
-        return $this->getRecordService()->leadCapture($params['apiKey'], $data);
+        $response->setHeader('Access-Control-Allow-Origin', $allowOrigin);
+
+        $this->getRecordService()->leadCapture($params['apiKey'], $data);
+
+        return true;
     }
 
     public function optionsActionLeadCapture($params, $data, $request, $response)
     {
-        if (empty($params['apiKey'])) throw new BadRequest('No API key provided.');
+        if (empty($params['apiKey'])) {
+            throw new BadRequest('No API key provided.');
+        }
 
         if (!$this->getRecordService()->isApiKeyValid($params['apiKey'])) {
             throw new NotFound();
@@ -56,23 +66,27 @@ class LeadCapture extends \Espo\Core\Controllers\Record
 
         $allowOrigin = $this->getConfig()->get('leadCaptureAllowOrigin', '*');
 
-        $response->headers->set('Access-Control-Allow-Headers', 'Content-Type, Accept');
-        $response->headers->set('Access-Control-Allow-Origin', $allowOrigin);
-        $response->headers->set('Access-Control-Allow-Methods', 'POST');
+        $response->setHeader('Access-Control-Allow-Headers', 'Content-Type, Accept');
+        $response->setHeader('Access-Control-Allow-Origin', $allowOrigin);
+        $response->setHeader('Access-Control-Allow-Methods', 'POST');
 
         return true;
     }
 
     public function postActionGenerateNewApiKey($params, $data, $request)
     {
-        if (empty($data->id)) throw new BadRequest();
+        if (empty($data->id)) {
+            throw new BadRequest();
+        }
 
         return $this->getRecordService()->generateNewApiKeyForEntity($data->id)->getValueMap();
     }
 
     public function getActionSmtpAccountDataList()
     {
-        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
 
         return $this->getServiceFactory()->create('LeadCapture')->getSmtpAccountDataList();
     }

application/Espo/Controllers/LeadCaptureLogRecord.php

@@ -29,9 +29,6 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
-
 class LeadCaptureLogRecord extends \Espo\Core\Controllers\Record
 {
 

application/Espo/Controllers/Metadata.php

@@ -29,11 +29,10 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\Forbidden;
 
 class Metadata extends \Espo\Core\Controllers\Base
 {
-
     public function actionRead($params, $data)
     {
         return $this->getServiceFactory()->create('Metadata')->getDataForFrontend();

application/Espo/Controllers/Notification.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Error;
 
 class Notification extends \Espo\Core\Controllers\Record
 {
@@ -47,18 +47,18 @@ class Notification extends \Espo\Core\Controllers\Record
             $maxSize = self::MAX_SIZE_LIMIT;
         }
 
-        $params = array(
+        $params = [
             'offset' => $offset,
             'maxSize' => $maxSize,
-            'after' => $after
-        );
+            'after' => $after,
+        ];
 
-        $result = $this->getService('Notification')->getList($userId, $params);
+        $recordCollection = $this->getService('Notification')->getList($userId, $params);
 
-        return array(
-            'total' => $result['total'],
-            'list' => $result['collection']->toArray()
-        );
+        return (object) [
+            'total' => $recordCollection->getTotal(),
+            'list' => $recordCollection->getValueMapList(),
+        ];
     }
 
     public function actionNotReadCount()

application/Espo/Controllers/Pdf.php

@@ -29,9 +29,9 @@
 
 namespace Espo\Controllers;
 
-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;
+use Espo\Core\Exceptions\Error;
 
 class Pdf extends \Espo\Core\Controllers\Base
 {

application/Espo/Controllers/PhoneNumber.php

@@ -29,8 +29,6 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
-
 class PhoneNumber extends \Espo\Core\Controllers\Record
 {
 

application/Espo/Controllers/Portal.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\Forbidden;
 
 class Portal extends \Espo\Core\Controllers\Record
 {

application/Espo/Controllers/Preferences.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
-use \Espo\Core\Exceptions\NotFound;
+use Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\NotFound;
 
 class Preferences extends \Espo\Core\Controllers\Base
 {

application/Espo/Controllers/Settings.php

@@ -32,6 +32,11 @@ namespace Espo\Controllers;
 use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\Exceptions\BadRequest;
 
+use Espo\Core\{
+    Authentication\LDAP\Utils as LDAPUtils,
+    Authentication\LDAP\Client as LDAPClient,
+};
+
 class Settings extends \Espo\Core\Controllers\Base
 {
     protected function getConfigData()
@@ -86,11 +91,14 @@ class Settings extends \Espo\Core\Controllers\Base
 
         $data = get_object_vars($data);
 
-        $ldapUtils = new \Espo\Core\Utils\Authentication\LDAP\Utils();
+        $ldapUtils = new LDAPUtils();
+
         $options = $ldapUtils->normalizeOptions($data);
 
-        $ldapClient = new \Espo\Core\Utils\Authentication\LDAP\Client($options);
-        $ldapClient->bind(); //an exception if no connection
+        $ldapClient = new LDAPClient($options);
+
+        //an exception if no connection
+        $ldapClient->bind();
 
         return true;
     }

application/Espo/Controllers/Stream.php

@@ -29,14 +29,26 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Error;
 
-class Stream extends \Espo\Core\Controllers\Base
+use Espo\Core\ServiceFactory;
+use Espo\Core\Utils\Config;
+
+class Stream
 {
     const MAX_SIZE_LIMIT = 200;
 
     public static $defaultAction = 'list';
 
+    protected $serviceFactory;
+    protected $config;
+
+    public function __construct(ServiceFactory $serviceFactory, Config $config)
+    {
+        $this->serviceFactory = $serviceFactory;
+        $this->config = $config;
+    }
+
     public function actionList($params, $data, $request)
     {
         $scope = $params['scope'];
@@ -48,9 +60,7 @@ class Stream extends \Espo\Core\Controllers\Base
         $filter = $request->get('filter');
         $skipOwn = $request->get('skipOwn') === 'true';
 
-        $service = $this->getService('Stream');
-
-        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
+        $maxSizeLimit = $this->config->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
         if (empty($maxSize)) {
             $maxSize = $maxSizeLimit;
         }
@@ -58,7 +68,7 @@ class Stream extends \Espo\Core\Controllers\Base
             throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
         }
 
-        $result = $service->find($scope, $id, [
+        $result = $this->serviceFactory->create('Stream')->find($scope, $id, [
             'offset' => $offset,
             'maxSize' => $maxSize,
             'after' => $after,
@@ -83,9 +93,7 @@ class Stream extends \Espo\Core\Controllers\Base
 
         $where = $request->get('where');
 
-        $service = $this->getService('Stream');
-
-        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
+        $maxSizeLimit = $this->config->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
         if (empty($maxSize)) {
             $maxSize = $maxSizeLimit;
         }
@@ -93,7 +101,7 @@ class Stream extends \Espo\Core\Controllers\Base
             throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
         }
 
-        $result = $service->find($scope, $id, [
+        $result = $this->serviceFactory->create('Stream')->find($scope, $id, [
             'offset' => $offset,
             'maxSize' => $maxSize,
             'after' => $after,

application/Espo/Controllers/Template.php

@@ -29,8 +29,6 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
-
 class Template extends \Espo\Core\Controllers\Record
 {
 

application/Espo/Controllers/TemplateManager.php

@@ -29,17 +29,26 @@
 
 namespace Espo\Controllers;
 
-use Espo\Core\Utils as Utils;
-use \Espo\Core\Exceptions\NotFound;
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
 
-class TemplateManager extends \Espo\Core\Controllers\Base
+use Espo\Core\Utils\Metadata;
+use Espo\Core\Utils\TemplateFileManager;
+use Espo\Core\ApplicationState;
+
+class TemplateManager
 {
-    protected function checkControllerAccess()
+    protected $metadata;
+    protected $templateFileManager;
+    protected $applicationState;
+
+    public function __construct(Metadata $metadata, TemplateFileManager $templateFileManager, ApplicationState $applicationState)
     {
-        if (!$this->getUser()->isAdmin()) {
+        $this->metadata = $metadata;
+        $this->templateFileManager = $templateFileManager;
+        $this->applicationState = $applicationState;
+
+        if (!$this->applicationState->isAdmin()) {
             throw new Forbidden();
         }
     }
@@ -50,10 +59,10 @@ class TemplateManager extends \Espo\Core\Controllers\Base
         if (empty($name)) throw new BadRequest();
         $scope = $request->get('scope');
         $module = null;
-        $module = $this->getMetadata()->get(['app', 'templates', $name, 'module']);
-        $hasSubject = !$this->getMetadata()->get(['app', 'templates', $name, 'noSubject']);
+        $module = $this->metadata->get(['app', 'templates', $name, 'module']);
+        $hasSubject = !$this->metadata->get(['app', 'templates', $name, 'noSubject']);
 
-        $templateFileManager = $this->getContainer()->get('templateFileManager');
+        $templateFileManager = $this->templateFileManager;
 
         $returnData = (object) [];
         $returnData->body = $templateFileManager->getTemplate($name, 'body', $scope, $module);
@@ -75,7 +84,7 @@ class TemplateManager extends \Espo\Core\Controllers\Base
             $scope = $data->scope;
         }
 
-        $templateFileManager = $this->getContainer()->get('templateFileManager');
+        $templateFileManager = $this->templateFileManager;
 
         if (isset($data->subject)) {
             $templateFileManager->saveTemplate($data->name, 'subject', $data->subject, $scope);
@@ -99,10 +108,10 @@ class TemplateManager extends \Espo\Core\Controllers\Base
         }
 
         $module = null;
-        $module = $this->getMetadata()->get(['app', 'templates', $data->name, 'module']);
-        $hasSubject = !$this->getMetadata()->get(['app', 'templates', $data->name, 'noSubject']);
+        $module = $this->metadata->get(['app', 'templates', $data->name, 'module']);
+        $hasSubject = !$this->metadata->get(['app', 'templates', $data->name, 'noSubject']);
 
-        $templateFileManager = $this->getContainer()->get('templateFileManager');
+        $templateFileManager = $this->templateFileManager;
 
         if ($hasSubject) {
             $templateFileManager->resetTemplate($data->name, 'subject', $scope);

application/Espo/Controllers/User.php

@@ -29,10 +29,10 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\NotFound;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\NotFound;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
 
 class User extends \Espo\Core\Controllers\Record
 {

application/Espo/Controllers/UserSecurity.php

@@ -29,10 +29,8 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\NotFound;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
 
 class UserSecurity extends \Espo\Core\Controllers\Base
 {

application/Espo/Controllers/Webhook.php

@@ -29,8 +29,7 @@
 
 namespace Espo\Controllers;
 
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\Forbidden;
 
 class Webhook extends \Espo\Core\Controllers\Record
 {

application/Espo/Core/Acl.php

@@ -29,9 +29,12 @@
 
 namespace Espo\Core;
 
-use \Espo\ORM\Entity;
-use \Espo\Entities\User;
+use Espo\ORM\Entity;
+use Espo\Entities\User;
 
+/**
+ * A wrapper for AclManager. To check access for a current user.
+ */
 class Acl
 {
     private $user;
@@ -54,102 +57,154 @@ class Acl
         return $this->user;
     }
 
-    public function getMap()
+    public function getMap() : \StdClass
     {
         return $this->getAclManager()->getMap($this->getUser());
     }
 
-    public function getLevel($scope, $action)
+    /**
+     * Get an access level for a specific scope and action.
+     */
+    public function getLevel(string $scope, string $action) : string
     {
         return $this->getAclManager()->getLevel($this->getUser(), $scope, $action);
     }
 
-    public function get($permission)
+    /**
+     * Get a permission. E.g. 'assignment' permission.
+     */
+    public function get(string $permission) : ?string
     {
         return $this->getAclManager()->get($this->getUser(), $permission);
     }
 
-    public function checkReadNo($scope)
+    /**
+     * Whether there's no 'read' access for a specific scope.
+     */
+    public function checkReadNo(string $scope) : bool
     {
         return $this->getAclManager()->checkReadNo($this->getUser(), $scope);
     }
 
-    public function checkReadOnlyTeam($scope)
+    /**
+     * Whether 'read' access is set to 'team' for a specific scope.
+     */
+    public function checkReadOnlyTeam(string $scope) : bool
     {
         return $this->getAclManager()->checkReadOnlyTeam($this->getUser(), $scope);
     }
 
-    public function checkReadOnlyOwn($scope)
+    /**
+     * Whether 'read' access is set to 'own' for a specific scope.
+     */
+    public function checkReadOnlyOwn(string $scope) : bool
     {
         return $this->getAclManager()->checkReadOnlyOwn($this->getUser(), $scope);
     }
 
-    public function check($subject, $action = null)
+    /**
+     * Check a scope or entity. If $action is omitted, it will check whether a scope level is set to 'enabled'.
+     */
+    public function check($subject, ?string $action = null) : bool
     {
         return $this->getAclManager()->check($this->getUser(), $subject, $action);
     }
 
-    public function checkScope($scope, $action = null)
+    /**
+     * Check access to scope. If $action is omitted, it will check whether a scope level is set to 'enabled'.
+     */
+    public function checkScope(string $scope, ?string $action = null) : bool
     {
         return $this->getAclManager()->checkScope($this->getUser(), $scope, $action);
     }
 
-    public function checkEntity(Entity $entity, $action = 'read')
+    /**
+     * Check access to a specific entity (record).
+     */
+    public function checkEntity(Entity $entity, string $action = 'read') : bool
     {
         return $this->getAclManager()->checkEntity($this->getUser(), $entity, $action);
     }
 
-    public function checkUser($permission, User $entity)
+    /**
+     * @deprecated
+     */
+    public function checkUser(string $permission, User $entity) : bool
     {
         return $this->getAclManager()->checkUser($this->getUser(), $permission, $entity);
     }
 
-    public function checkIsOwner(Entity $entity)
+    /**
+     * Whether a user is owned of an entity (record). Usually 'assignedUser' field is used for checking.
+     */
+    public function checkIsOwner(Entity $entity) : bool
     {
         return $this->getAclManager()->checkIsOwner($this->getUser(), $entity);
     }
 
-    public function checkInTeam(Entity $entity)
+    /**
+     * Whether a user team list overlaps with teams set in an entity.
+     */
+    public function checkInTeam(Entity $entity) : bool
     {
         return $this->getAclManager()->checkInTeam($this->getUser(), $entity);
     }
 
-    public function getScopeForbiddenAttributeList($scope, $action = 'read', $thresholdLevel = 'no')
+    /**
+     * Get attributes forbidden for a user.
+     */
+    public function getScopeForbiddenAttributeList(string $scope, string $action = 'read', string $thresholdLevel = 'no') : array
     {
         return $this->getAclManager()->getScopeForbiddenAttributeList($this->getUser(), $scope, $action, $thresholdLevel);
     }
 
-    public function getScopeForbiddenFieldList($scope, $action = 'read', $thresholdLevel = 'no')
+    /**
+     * Get fields forbidden for a user.
+     */
+    public function getScopeForbiddenFieldList(string $scope, string $action = 'read', string $thresholdLevel = 'no') : array
     {
         return $this->getAclManager()->getScopeForbiddenFieldList($this->getUser(), $scope, $action, $thresholdLevel);
     }
 
-    public function getScopeForbiddenLinkList($scope, $action = 'read', $thresholdLevel = 'no')
+    /**
+     * Get links forbidden for a user.
+     */
+    public function getScopeForbiddenLinkList(string $scope, string $action = 'read', string $thresholdLevel = 'no') : array
     {
         return $this->getAclManager()->getScopeForbiddenLinkList($this->getUser(), $scope, $action, $thresholdLevel);
     }
 
-    public function checkUserPermission($target, $permissionType = 'userPermission')
+    /**
+     * Whether a user has an access to another user over a specific permission.
+     *
+     * @param $target User|string User entity or user ID.
+     */
+    public function checkUserPermission($target, string $permissionType = 'user') : bool
     {
         return $this->getAclManager()->checkUserPermission($this->getUser(), $target, $permissionType);
     }
 
-    public function checkAssignmentPermission($target)
+    /**
+     * Whether a user can assign to another user.
+     *
+     * @param $target User|string User entity or user ID.
+     */
+    public function checkAssignmentPermission($target) : bool
     {
         return $this->getAclManager()->checkAssignmentPermission($this->getUser(), $target);
     }
 
-    public function getScopeRestrictedFieldList($scope, $type)
+    public function getScopeRestrictedFieldList(string $scope, $type) : array
     {
         return $this->getAclManager()->getScopeRestrictedFieldList($scope, $type);
     }
 
-    public function getScopeRestrictedAttributeList($scope, $type)
+    public function getScopeRestrictedAttributeList(string $scope, $type) : array
     {
         return $this->getAclManager()->getScopeRestrictedAttributeList($scope, $type);
     }
 
-    public function getScopeRestrictedLinkList($scope, $type)
+    public function getScopeRestrictedLinkList(string $scope, $type) : array
     {
         return $this->getAclManager()->getScopeRestrictedLinkList($scope, $type);
     }

application/Espo/Core/Acl/Acl.php

@@ -0,0 +1,296 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Acl;
+
+use Espo\Entities\User;
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    ORM\EntityManager,
+    AclManager,
+    Utils\Config,
+};
+
+/**
+ * An implementation for access checking for entities. Can be overriden in `Acl` namespece.
+ */
+class Acl implements ScopeAcl, EntityAcl
+{
+    protected $scope;
+
+    protected $ownerUserIdAttribute = null;
+
+    protected $allowDeleteCreatedThresholdPeriod = '24 hours';
+
+    protected $entityManager;
+    protected $aclManager;
+    protected $config;
+
+    public function __construct(string $scope, EntityManager $entityManager, AclManager $aclManager, Config $config)
+    {
+        $this->scope = $scope;
+
+        $this->entityManager = $entityManager;
+        $this->aclManager = $aclManager;
+        $this->config = $config;
+    }
+
+    protected function getConfig()
+    {
+        return $this->config;
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->entityManager;
+    }
+
+    protected function getAclManager()
+    {
+        return $this->aclManager;
+    }
+
+    public function checkReadOnlyTeam(User $user, $data)
+    {
+        if (empty($data) || !is_object($data) || !isset($data->read)) {
+            return false;
+        }
+        return $data->read === 'team';
+    }
+
+    public function checkReadNo(User $user, $data)
+    {
+        if (empty($data) || !is_object($data) || !isset($data->read)) {
+            return false;
+        }
+        return $data->read === 'no';
+    }
+
+    public function checkReadOnlyOwn(User $user, $data)
+    {
+        if (empty($data) || !is_object($data) || !isset($data->read)) {
+            return false;
+        }
+        return $data->read === 'own';
+    }
+
+    public function checkEntity(User $user, Entity $entity, $data, $action)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        return $this->checkScope($user, $data, $action, $entity);
+    }
+
+    public function checkScope(User $user, $data, $action = null, Entity $entity = null, $entityAccessData = [])
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if (is_null($data)) {
+            return false;
+        }
+        if ($data === false) {
+            return false;
+        }
+        if ($data === true) {
+            return true;
+        }
+        if (is_string($data)) {
+            return true;
+        }
+
+        $isOwner = null;
+        if (isset($entityAccessData['isOwner'])) {
+            $isOwner = $entityAccessData['isOwner'];
+        }
+        $inTeam = null;
+        if (isset($entityAccessData['inTeam'])) {
+            $inTeam = $entityAccessData['inTeam'];
+        }
+
+        if (is_null($action)) {
+            return true;
+        }
+
+        if (!isset($data->$action)) {
+            return false;
+        }
+
+        $value = $data->$action;
+
+        if ($value === 'all' || $value === 'yes' || $value === true) {
+            return true;
+        }
+
+        if (!$value || $value === 'no') {
+            return false;
+        }
+
+        if (is_null($isOwner)) {
+            if ($entity) {
+                $isOwner = $this->checkIsOwner($user, $entity);
+            } else {
+                return true;
+            }
+        }
+
+        if ($isOwner) {
+            if ($value === 'own' || $value === 'team') {
+                return true;
+            }
+        }
+        if (is_null($inTeam) && $entity) {
+            $inTeam = $this->checkInTeam($user, $entity);
+        }
+
+        if ($inTeam) {
+            if ($value === 'team') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function checkIsOwner(User $user, Entity $entity)
+    {
+        if ($entity->hasAttribute('assignedUserId')) {
+            if ($entity->has('assignedUserId')) {
+                if ($user->id === $entity->get('assignedUserId')) {
+                    return true;
+                }
+            }
+        } else if ($entity->hasAttribute('createdById')) {
+            if ($entity->has('createdById')) {
+                if ($user->id === $entity->get('createdById')) {
+                    return true;
+                }
+            }
+        }
+
+        if ($entity->hasLinkMultipleField('assignedUsers')) {
+            if ($entity->hasLinkMultipleId('assignedUsers', $user->id)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function checkInTeam(User $user, Entity $entity)
+    {
+        $userTeamIdList = $user->getLinkMultipleIdList('teams');
+
+        if (!$entity->hasRelation('teams') || !$entity->hasAttribute('teamsIds')) {
+            return false;
+        }
+
+        $entityTeamIdList = $entity->getLinkMultipleIdList('teams');
+
+        if (empty($entityTeamIdList)) {
+            return false;
+        }
+
+        foreach ($userTeamIdList as $id) {
+            if (in_array($id, $entityTeamIdList)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function checkEntityDelete(User $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($this->checkEntity($user, $entity, $data, 'delete')) {
+            return true;
+        }
+
+        if (is_object($data)) {
+            if ($data->edit !== 'no' || $data->create !== 'no') {
+                if (
+                    $this->config->get('aclAllowDeleteCreated')
+                    &&
+                    $entity->has('createdById') && $entity->get('createdById') == $user->id
+                ) {
+                    $isDeletedAllowed = false;
+                    if (!$entity->has('assignedUserId')) {
+                        $isDeletedAllowed = true;
+                    } else {
+                        if (!$entity->get('assignedUserId')) {
+                            $isDeletedAllowed = true;
+                        } else if ($entity->get('assignedUserId') == $entity->get('createdById')) {
+                            $isDeletedAllowed = true;
+                        }
+                    }
+
+                    if ($isDeletedAllowed) {
+                        $createdAt = $entity->get('createdAt');
+                        if ($createdAt) {
+                            $deleteThresholdPeriod = $this->config->get(
+                                'aclAllowDeleteCreatedThresholdPeriod',
+                                $this->allowDeleteCreatedThresholdPeriod
+                            );
+                            if (\Espo\Core\Utils\DateTime::isAfterThreshold($createdAt, $deleteThresholdPeriod)) {
+                                return false;
+                            }
+                        }
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public function getOwnerUserIdAttribute(Entity $entity)
+    {
+        if ($this->ownerUserIdAttribute) {
+            return $this->ownerUserIdAttribute;
+        }
+
+        if ($entity->hasLinkMultipleField('assignedUsers')) {
+            return 'assignedUsersIds';
+        }
+
+        if ($entity->hasAttribute('assignedUserId')) {
+            return 'assignedUserId';
+        }
+
+        if ($entity->hasAttribute('createdById')) {
+            return 'createdById';
+        }
+    }
+}

application/Espo/Core/Acl/Base.php

@@ -29,39 +29,39 @@
 
 namespace Espo\Core\Acl;
 
-use \Espo\Core\Interfaces\Injectable;
+use Espo\Core\Interfaces\Injectable;
 
-use \Espo\Entities\User;
-use \Espo\ORM\Entity;
+use Espo\Entities\User;
+use Espo\ORM\Entity;
 
-class Base implements Injectable
+use Espo\Core\{
+    ORM\EntityManager,
+    AclManager,
+    Utils\Config,
+};
+
+/** @deprecated */
+class Base extends Acl implements Injectable
 {
-    protected $dependencyList = [
-        'config',
-        'entityManager',
-        'aclManager',
-    ];
+    protected $dependencyList = [];
 
-    protected $dependencies = []; // for backward compatibility
-
-    protected $scope;
+    protected $dependencies = [];
 
     protected $injections = [];
 
-    protected $ownerUserIdAttribute = null;
+    public function __construct(string $scope, EntityManager $entityManager, AclManager $aclManager, Config $config)
+    {
+        $this->scope = $scope;
+        parent::__construct($scope, $entityManager, $aclManager, $config);
 
-    protected $allowDeleteCreatedThresholdPeriod = '24 hours';
+        $this->init();
+    }
 
     public function inject($name, $object)
     {
         $this->injections[$name] = $object;
     }
 
-    public function __construct($scope)
-    {
-        $this->init();
-        $this->scope = $scope;
-    }
 
     protected function init()
     {
@@ -69,7 +69,7 @@ class Base implements Injectable
 
     protected function getInjection($name)
     {
-        return $this->injections[$name];
+        return $this->injections[$name] ?? $this->$name ?? null;
     }
 
     protected function addDependencyList(array $list)
@@ -88,233 +88,4 @@ class Base implements Injectable
     {
         return array_merge($this->dependencyList, $this->dependencies);
     }
-
-    protected function getConfig()
-    {
-        return $this->getInjection('config');
-    }
-
-    protected function getEntityManager()
-    {
-        return $this->getInjection('entityManager');
-    }
-
-    protected function getAclManager()
-    {
-        return $this->getInjection('aclManager');
-    }
-
-    public function checkReadOnlyTeam(User $user, $data)
-    {
-        if (empty($data) || !is_object($data) || !isset($data->read)) {
-            return false;
-        }
-        return $data->read === 'team';
-    }
-
-    public function checkReadNo(User $user, $data)
-    {
-        if (empty($data) || !is_object($data) || !isset($data->read)) {
-            return false;
-        }
-        return $data->read === 'no';
-    }
-
-    public function checkReadOnlyOwn(User $user, $data)
-    {
-        if (empty($data) || !is_object($data) || !isset($data->read)) {
-            return false;
-        }
-        return $data->read === 'own';
-    }
-
-    public function checkEntity(User $user, Entity $entity, $data, $action)
-    {
-        if ($user->isAdmin()) {
-            return true;
-        }
-        return $this->checkScope($user, $data, $action, $entity);
-    }
-
-    public function checkScope(User $user, $data, $action = null, Entity $entity = null, $entityAccessData = array())
-    {
-        if ($user->isAdmin()) {
-            return true;
-        }
-
-        if (is_null($data)) {
-            return false;
-        }
-        if ($data === false) {
-            return false;
-        }
-        if ($data === true) {
-            return true;
-        }
-        if (is_string($data)) {
-            return true;
-        }
-
-        $isOwner = null;
-        if (isset($entityAccessData['isOwner'])) {
-            $isOwner = $entityAccessData['isOwner'];
-        }
-        $inTeam = null;
-        if (isset($entityAccessData['inTeam'])) {
-            $inTeam = $entityAccessData['inTeam'];
-        }
-
-        if (is_null($action)) {
-            return true;
-        }
-
-        if (!isset($data->$action)) {
-            return false;
-        }
-
-        $value = $data->$action;
-
-        if ($value === 'all' || $value === 'yes' || $value === true) {
-            return true;
-        }
-
-        if (!$value || $value === 'no') {
-            return false;
-        }
-
-        if (is_null($isOwner)) {
-            if ($entity) {
-                $isOwner = $this->checkIsOwner($user, $entity);
-            } else {
-                return true;
-            }
-        }
-
-        if ($isOwner) {
-            if ($value === 'own' || $value === 'team') {
-                return true;
-            }
-        }
-        if (is_null($inTeam) && $entity) {
-            $inTeam = $this->checkInTeam($user, $entity);
-        }
-
-        if ($inTeam) {
-            if ($value === 'team') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public function checkIsOwner(User $user, Entity $entity)
-    {
-        if ($entity->hasAttribute('assignedUserId')) {
-            if ($entity->has('assignedUserId')) {
-                if ($user->id === $entity->get('assignedUserId')) {
-                    return true;
-                }
-            }
-        } else if ($entity->hasAttribute('createdById')) {
-            if ($entity->has('createdById')) {
-                if ($user->id === $entity->get('createdById')) {
-                    return true;
-                }
-            }
-        }
-
-        if ($entity->hasLinkMultipleField('assignedUsers')) {
-            if ($entity->hasLinkMultipleId('assignedUsers', $user->id)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function checkInTeam(User $user, Entity $entity)
-    {
-        $userTeamIdList = $user->getLinkMultipleIdList('teams');
-
-        if (!$entity->hasRelation('teams') || !$entity->hasAttribute('teamsIds')) {
-            return false;
-        }
-
-        $entityTeamIdList = $entity->getLinkMultipleIdList('teams');
-
-        if (empty($entityTeamIdList)) {
-            return false;
-        }
-
-        foreach ($userTeamIdList as $id) {
-            if (in_array($id, $entityTeamIdList)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public function checkEntityDelete(User $user, Entity $entity, $data)
-    {
-        if ($user->isAdmin()) {
-            return true;
-        }
-
-        if ($this->checkEntity($user, $entity, $data, 'delete')) {
-            return true;
-        }
-
-        if (is_object($data)) {
-            if ($data->edit !== 'no' || $data->create !== 'no') {
-                if (
-                    $this->getConfig()->get('aclAllowDeleteCreated')
-                    &&
-                    $entity->has('createdById') && $entity->get('createdById') == $user->id
-                ) {
-                    $isDeletedAllowed = false;
-                    if (!$entity->has('assignedUserId')) {
-                        $isDeletedAllowed = true;
-                    } else {
-                        if (!$entity->get('assignedUserId')) {
-                            $isDeletedAllowed = true;
-                        } else if ($entity->get('assignedUserId') == $entity->get('createdById')) {
-                            $isDeletedAllowed = true;
-                        }
-                    }
-
-                    if ($isDeletedAllowed) {
-                        $createdAt = $entity->get('createdAt');
-                        if ($createdAt) {
-                            $deleteThresholdPeriod = $this->getConfig()->get('aclAllowDeleteCreatedThresholdPeriod', $this->allowDeleteCreatedThresholdPeriod);
-                            if (\Espo\Core\Utils\DateTime::isAfterThreshold($createdAt, $deleteThresholdPeriod)) {
-                                return false;
-                            }
-                        }
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public function getOwnerUserIdAttribute(Entity $entity)
-    {
-        if ($this->ownerUserIdAttribute) {
-            return $this->ownerUserIdAttribute;
-        }
-
-        if ($entity->hasLinkMultipleField('assignedUsers')) {
-            return 'assignedUsersIds';
-        }
-
-        if ($entity->hasAttribute('assignedUserId')) {
-            return 'assignedUserId';
-        }
-
-        if ($entity->hasAttribute('createdById')) {
-            return 'createdById';
-        }
-    }
 }

application/Espo/Core/Acl/EntityAcl.php

@@ -0,0 +1,41 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Acl;
+
+use Espo\Entities\User;
+use Espo\ORM\Entity;
+
+/**
+ * @todo Add methods.
+ */
+interface EntityAcl
+{
+
+}

application/Espo/Core/Acl/GlobalRestricton.php

@@ -29,6 +29,17 @@
 
 namespace Espo\Core\Acl;
 
+use Espo\Core\{
+    Utils\Metadata,
+    Utils\DataCache,
+    Utils\FieldUtil,
+};
+
+use StdClass;
+
+/**
+ * Lists of restricted fields can be obtained from here. Restricted fields are specified in metadata > entityAcl.
+ */
 class GlobalRestricton
 {
     protected $fieldTypeList = [
@@ -47,36 +58,32 @@ class GlobalRestricton
         'nonAdminReadOnly' // read-only for non-admin users
     ];
 
-    protected $cacheFilePath = 'data/cache/application/entityAcl.php';
-
-    private $metadata;
-
-    private $fileManager;
-
-    private $fieldManagerUtil;
-
     private $data;
 
+    protected $cacheKey = 'entityAcl';
+
+    private $metadata;
+    private $dataCache;
+    private $fieldUtil;
+
     public function __construct(
-        \Espo\Core\Utils\Metadata $metadata,
-        \Espo\Core\Utils\File\Manager $fileManager,
-        \Espo\Core\Utils\FieldManagerUtil $fieldManagerUtil,
-        bool $useCache = true
-    )
-    {
+        Metadata $metadata, DataCache $dataCache, FieldUtil $fieldUtil, bool $useCache = true
+    ) {
         $this->metadata = $metadata;
-        $this->fileManager = $fileManager;
-        $this->fieldManagerUtil = $fieldManagerUtil;
+        $this->dataCache = $dataCache;
+        $this->fieldUtil = $fieldUtil;
 
         $isFromCache = false;
 
         if ($useCache) {
-            if (file_exists($this->cacheFilePath)) {
-                $this->data = include($this->cacheFilePath);
+            if ($this->dataCache->has($this->cacheKey)) {
+                $this->data = $this->dataCache->get($this->cacheKey);
+
                 $isFromCache = true;
 
-                if (!($this->data instanceof \StdClass)) {
+                if (! $this->data instanceof StdClass) {
                     $GLOBALS['log']->error("ACL GlobalRestricton: Bad data fetched from cache.");
+
                     $this->data = null;
                 }
             }
@@ -95,25 +102,25 @@ class GlobalRestricton
 
     protected function storeCacheFile()
     {
-        $this->getFileManager()->putPhpContents($this->cacheFilePath, $this->data, true);
+        $this->dataCache->store($this->cacheKey, $this->data, true);
     }
 
     protected function buildData()
     {
-        $scopeList = array_keys($this->getMetadata()->get(['entityDefs'], []));
+        $scopeList = array_keys($this->metadata->get(['entityDefs'], []));
 
         $data = (object) [];
 
         foreach ($scopeList as $scope) {
-            $fieldList = array_keys($this->getMetadata()->get(['entityDefs', $scope, 'fields'], []));
-            $linkList = array_keys($this->getMetadata()->get(['entityDefs', $scope, 'links'], []));
+            $fieldList = array_keys($this->metadata->get(['entityDefs', $scope, 'fields'], []));
+            $linkList = array_keys($this->metadata->get(['entityDefs', $scope, 'links'], []));
 
             $isNotEmpty = false;
 
             $scopeData = (object) [
                 'fields' => (object) [],
                 'attributes' => (object) [],
-                'links' => (object) []
+                'links' => (object) [],
             ];
 
             foreach ($this->fieldTypeList as $type) {
@@ -121,10 +128,13 @@ class GlobalRestricton
                 $resultAttributeList = [];
 
                 foreach ($fieldList as $field) {
-                    if ($this->getMetadata()->get(['entityAcl', $scope, 'fields', $field, $type])) {
+                    if ($this->metadata->get(['entityAcl', $scope, 'fields', $field, $type])) {
                         $isNotEmpty = true;
+
                         $resultFieldList[] = $field;
-                        $fieldAttributeList = $this->getFieldManagerUtil()->getAttributeList($scope, $field);
+
+                        $fieldAttributeList = $this->fieldUtil->getAttributeList($scope, $field);
+
                         foreach ($fieldAttributeList as $attribute) {
                             $resultAttributeList[] = $attribute;
                         }
@@ -136,9 +146,11 @@ class GlobalRestricton
             }
             foreach ($this->linkTypeList as $type) {
                 $resultLinkList = [];
+
                 foreach ($linkList as $link) {
-                    if ($this->getMetadata()->get(['entityAcl', $scope, 'links', $link, $type])) {
+                    if ($this->metadata->get(['entityAcl', $scope, 'links', $link, $type])) {
                         $isNotEmpty = true;
+
                         $resultLinkList[] = $link;
                     }
                 }
@@ -153,44 +165,52 @@ class GlobalRestricton
         $this->data = $data;
     }
 
-    protected function getMetadata()
+    public function getScopeRestrictedFieldList(string $scope, string $type) : array
     {
-        return $this->metadata;
-    }
+        if (!property_exists($this->data, $scope)) {
+            return [];
+        }
+        if (!property_exists($this->data->$scope, 'fields')) {
+            return [];
+        }
 
-    protected function getFileManager()
-    {
-        return $this->fileManager;
-    }
-
-    protected function getFieldManagerUtil()
-    {
-        return $this->fieldManagerUtil;
-    }
-
-    public function getScopeRestrictedFieldList($scope, $type)
-    {
-        if (!property_exists($this->data, $scope)) return [];
-        if (!property_exists($this->data->$scope, 'fields')) return [];
-        if (!property_exists($this->data->$scope->fields, $type)) return [];
+        if (!property_exists($this->data->$scope->fields, $type)) {
+            return [];
+        }
 
         return $this->data->$scope->fields->$type;
     }
 
-    public function getScopeRestrictedAttributeList($scope, $type)
+    public function getScopeRestrictedAttributeList(string $scope, string $type) : array
     {
-        if (!property_exists($this->data, $scope)) return [];
-        if (!property_exists($this->data->$scope, 'attributes')) return [];
-        if (!property_exists($this->data->$scope->attributes, $type)) return [];
+        if (!property_exists($this->data, $scope)) {
+            return [];
+        }
+
+        if (!property_exists($this->data->$scope, 'attributes')) {
+            return [];
+        }
+
+        if (!property_exists($this->data->$scope->attributes, $type)) {
+            return [];
+        }
 
         return $this->data->$scope->attributes->$type;
     }
 
-    public function getScopeRestrictedLinkList($scope, $type)
+    public function getScopeRestrictedLinkList(string $scope, string $type) : array
     {
-        if (!property_exists($this->data, $scope)) return [];
-        if (!property_exists($this->data->$scope, 'links')) return [];
-        if (!property_exists($this->data->$scope->links, $type)) return [];
+        if (!property_exists($this->data, $scope)) {
+            return [];
+        }
+
+        if (!property_exists($this->data->$scope, 'links')) {
+            return [];
+        }
+
+        if (!property_exists($this->data->$scope->links, $type)) {
+            return [];
+        }
 
         return $this->data->$scope->links->$type;
     }

application/Espo/Core/Acl/ScopeAcl.php

@@ -0,0 +1,41 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Acl;
+
+use Espo\Entities\User;
+use Espo\ORM\Entity;
+
+/**
+ * @todo Add methods.
+ */
+interface ScopeAcl
+{
+
+}

application/Espo/Core/Acl/Table.php

@@ -29,16 +29,26 @@
 
 namespace Espo\Core\Acl;
 
-use \Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Error;
 
-use \Espo\ORM\Entity;
-use \Espo\Entities\User;
+use Espo\Entities\User;
 
-use \Espo\Core\Utils\Config;
-use \Espo\Core\Utils\Metadata;
-use \Espo\Core\Utils\FieldManagerUtil;
-use \Espo\Core\Utils\File\Manager as FileManager;
+use Espo\Core\{
+    ORM\EntityManager,
+    ORM\Entity,
+    Utils\Config,
+    Utils\Metadata,
+    Utils\FieldUtil,
+    Utils\DataCache,
+};
 
+use StdClass;
+use Traversable;
+
+/**
+ * A table is generated for each user. Multiple roles are merged into a single table.
+ * This table is used for access checking.
+ */
 class Table
 {
     protected $type = 'acl';
@@ -47,7 +57,7 @@ class Table
 
     private $data = null;
 
-    protected $cacheFilePath;
+    protected $cacheKey;
 
     protected $actionList = ['read', 'stream', 'edit', 'delete', 'create'];
 
@@ -59,26 +69,35 @@ class Table
 
     protected $fieldLevelList = ['yes', 'no'];
 
-    protected $valuePermissionHighestLevels = array();
+    protected $valuePermissionHighestLevels = [];
 
     protected $valuePermissionList = [];
 
-    private $fileManager;
+    protected $forbiddenAttributesCache = [];
 
-    private $metadata;
-
-    private $fieldManager;
-
-    protected $forbiddenAttributesCache = array();
-
-    protected $forbiddenFieldsCache = array();
+    protected $forbiddenFieldsCache = [];
 
     protected $isStrictModeForced = false;
 
     protected $isStrictMode = false;
 
-    public function __construct(User $user, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManagerUtil $fieldManager = null)
-    {
+    protected $entityManager;
+    protected $user;
+    protected $config;
+    protected $metadata;
+    protected $fieldUtil;
+    protected $dataCache;
+
+    public function __construct(
+        EntityManager $entityManager,
+        User $user,
+        Config $config = null,
+        Metadata $metadata = null,
+        FieldUtil $fieldUtil = null,
+        DataCache $dataCache
+    ) {
+        $this->entityManager = $entityManager;
+
         $this->data = (object) [
             'table' => (object) [],
             'fieldTable' => (object) [],
@@ -92,39 +111,34 @@ class Table
         }
 
         $this->user = $user;
-
         $this->metadata = $metadata;
-
-        if ($fieldManager) {
-            $this->fieldManager = $fieldManager;
-        }
+        $this->fieldUtil = $fieldUtil;
+        $this->dataCache = $dataCache;
 
         if (!$this->user->isFetched()) {
             throw new Error('User must be fetched before ACL check.');
         }
 
-        if ($fileManager) {
-            $this->fileManager = $fileManager;
-        }
         $this->valuePermissionList = $this->metadata->get(['app', $this->type, 'valuePermissionList'], []);
-        $this->valuePermissionHighestLevels = $this->metadata->get(['app', $this->type, 'valuePermissionHighestLevels'], array());
+        $this->valuePermissionHighestLevels = $this->metadata->get(['app', $this->type, 'valuePermissionHighestLevels'], []);
 
-        $this->initCacheFilePath();
+        $this->initCacheKey();
 
-        if ($config && $config->get('useCache') && file_exists($this->cacheFilePath)) {
-            $cached = include $this->cacheFilePath;
-            $this->data = $cached;
-        } else {
+        if ($config && $config->get('useCache') && $this->dataCache->has($this->cacheKey)) {
+            $this->data = $this->dataCache->get($this->cacheKey);
+        }
+        else {
             $this->load();
-            if ($config && $fileManager && $config->get('useCache')) {
+
+            if ($config && $config->get('useCache')) {
                 $this->buildCache();
             }
         }
     }
 
-    protected function initCacheFilePath()
+    protected function initCacheKey()
     {
-        $this->cacheFilePath = 'data/cache/application/acl/' . $this->getUser()->id . '.php';
+        $this->cacheKey = 'acl/' . $this->getUser()->id;
     }
 
     protected function getUser()
@@ -137,12 +151,12 @@ class Table
         return $this->metadata;
     }
 
-    protected function getFieldManager()
+    protected function getFieldUtil()
     {
-        return $this->fieldManager;
+        return $this->fieldUtil;
     }
 
-    public function getMap()
+    public function getMap() : StdClass
     {
         return $this->data;
     }
@@ -151,16 +165,20 @@ class Table
     {
         if (isset($this->data->table->$scope)) {
             $data = $this->data->table->$scope;
+
             if (is_string($data)) {
                 $data = $this->getScopeData($data);
+
                 return $data;
             }
+
             return $data;
         }
+
         return null;
     }
 
-    public function get($permission)
+    public function get(string $permission) : ?string
     {
         if ($permission == 'table') {
             return null;
@@ -169,32 +187,36 @@ class Table
         if (isset($this->data->$permission)) {
             return $this->data->$permission;
         }
+
         return 'no';
     }
 
-    public function getLevel($scope, $action)
+    public function getLevel(string $scope, string $action) : string
     {
         if (isset($this->data->table->$scope)) {
             if (isset($this->data->table->$scope->$action)) {
                 return $this->data->table->$scope->$action;
             }
         }
+
         return 'no';
     }
 
-    public function getHighestLevel($scope, $action)
+    public function getHighestLevel(string $scope, string $action) : string
     {
         if (in_array($action, $this->booleanActionList)) {
             return 'yes';
-        } else {
-            $level = $this->metadata->get(['scopes', $scope, $this->type . 'HighestLevel']);
-            return $level ?? 'all';
         }
+
+        $level = $this->metadata->get(['scopes', $scope, $this->type . 'HighestLevel']);
+
+        return $level ?? 'all';
     }
 
     private function load()
     {
-        $valuePermissionLists = (object)[];
+        $valuePermissionLists = (object) [];
+
         foreach ($this->valuePermissionList as $permission) {
             $valuePermissionLists->$permission = [];
         }
@@ -208,6 +230,7 @@ class Table
             foreach ($roleList as $role) {
                 $aclTableList[] = $role->get('data');
                 $fieldTableList[] = $role->get('fieldData');
+
                 foreach ($this->valuePermissionList as $permission) {
                     $valuePermissionLists->{$permission}[] = $role->get($permission);
                 }
@@ -220,17 +243,20 @@ class Table
             $this->applyDisabled($aclTable, $fieldTable);
             $this->applyMandatory($aclTable, $fieldTable);
             $this->applyAdditional($aclTable, $fieldTable, $valuePermissionLists);
-            $this->applyReadOnlyFields($fieldTable);
-        } else {
+        }
+        else {
             $aclTable = (object) [];
+
             foreach ($this->getScopeList() as $scope) {
                 if ($this->metadata->get("scopes.{$scope}.{$this->type}") === 'boolean') {
                     $aclTable->$scope = true;
                 } else {
                     if ($this->metadata->get("scopes.{$scope}.entity")) {
                         $aclTable->$scope = (object) [];
+
                         foreach ($this->actionList as $action) {
                             $aclTable->$scope->$action = 'all';
+
                             if (in_array($action, $this->booleanActionList)) {
                                 $aclTable->$scope->$action = 'yes';
                             }
@@ -256,11 +282,17 @@ class Table
 
         if (!$this->getUser()->isAdmin()) {
             $permissionsDefaultsGroupName = 'permissionsDefaults';
+
             if ($this->isStrictMode) {
                 $permissionsDefaultsGroupName = 'permissionsStrictDefaults';
             }
+
             foreach ($this->valuePermissionList as $permission) {
-                $this->data->$permission = $this->mergeValueList($valuePermissionLists->$permission, $this->metadata->get(['app', $this->type, $permissionsDefaultsGroupName, $permission, 'yes']));
+                $this->data->$permission = $this->mergeValueList(
+                    $valuePermissionLists->$permission,
+                    $this->metadata->get(['app', $this->type, $permissionsDefaultsGroupName, $permission, 'yes'])
+                );
+
                 if ($this->metadata->get('app.'.$this->type.'.mandatory.' . $permission)) {
                     $this->data->$permission = $this->metadata->get('app.'.$this->type.'.mandatory.' . $permission);
                 }
@@ -270,8 +302,10 @@ class Table
             foreach ($this->valuePermissionList as $permission) {
                 if (isset($this->valuePermissionHighestLevels[$permission])) {
                     $this->data->$permission = $this->valuePermissionHighestLevels[$permission];
+
                     continue;
                 }
+
                 $this->data->$permission = 'all';
             }
         }
@@ -281,20 +315,34 @@ class Table
     {
         $roleList = [];
 
-        $userRoleList = $this->getUser()->get('roles');
-        if (!(is_array($userRoleList) || $userRoleList instanceof \Traversable)) {
+        $userRoleList = $this->entityManager
+            ->getRepository('User')
+            ->getRelation($this->getUser(), 'roles')
+            ->find();
+
+        if (! $userRoleList instanceof Traversable) {
             throw new Error();
         }
+
         foreach ($userRoleList as $role) {
             $roleList[] = $role;
         }
 
-        $teamList = $this->getUser()->get('teams');
-        if (!(is_array($teamList) || $teamList instanceof \Traversable)) {
+        $teamList = $this->entityManager
+            ->getRepository('User')
+            ->getRelation($this->getUser(), 'teams')
+            ->find();
+
+        if (! $teamList instanceof Traversable) {
             throw new Error();
         }
+
         foreach ($teamList as $team) {
-            $teamRoleList = $team->get('roles');
+            $teamRoleList = $this->entityManager
+                ->getRepository('Team')
+                ->getRelation($team, 'roles')
+                ->find();
+
             foreach ($teamRoleList as $role) {
                 $roleList[] = $role;
             }
@@ -303,21 +351,27 @@ class Table
         return $roleList;
     }
 
-    public function getScopeForbiddenAttributeList($scope, $action = 'read', $thresholdLevel = 'no')
+    public function getScopeForbiddenAttributeList(string $scope, string $action = 'read', string $thresholdLevel = 'no') : array
     {
         $key = $scope . '_'. $action . '_' . $thresholdLevel;
+
         if (isset($this->forbiddenAttributesCache[$key])) {
             return $this->forbiddenAttributesCache[$key];
         }
 
         $fieldTableQuickAccess = $this->data->fieldTableQuickAccess;
 
-        if (!isset($fieldTableQuickAccess->$scope) || !isset($fieldTableQuickAccess->$scope->attributes) || !isset($fieldTableQuickAccess->$scope->attributes->$action)) {
+        if (
+            !isset($fieldTableQuickAccess->$scope) || !isset($fieldTableQuickAccess->$scope->attributes) ||
+            !isset($fieldTableQuickAccess->$scope->attributes->$action)
+        ) {
             $this->forbiddenAttributesCache[$key] = [];
+
             return [];
         }
 
         $levelList = [];
+
         foreach ($this->fieldLevelList as $level) {
             if (array_search($level, $this->fieldLevelList) >= array_search($thresholdLevel, $this->fieldLevelList)) {
                 $levelList[] = $level;
@@ -327,9 +381,15 @@ class Table
         $attributeList = [];
 
         foreach ($levelList as $level) {
-            if (!isset($fieldTableQuickAccess->$scope->attributes->$action->$level)) continue;
+            if (!isset($fieldTableQuickAccess->$scope->attributes->$action->$level)) {
+                continue;
+            }
+
             foreach ($fieldTableQuickAccess->$scope->attributes->$action->$level as $attribute) {
-                if (in_array($attribute, $attributeList)) continue;
+                if (in_array($attribute, $attributeList)) {
+                    continue;
+                }
+
                 $attributeList[] = $attribute;
             }
         }
@@ -339,7 +399,7 @@ class Table
         return $attributeList;
     }
 
-    public function getScopeForbiddenFieldList($scope, $action = 'read', $thresholdLevel = 'no')
+    public function getScopeForbiddenFieldList(string $scope, string $action = 'read', string $thresholdLevel = 'no') : array
     {
         $key = $scope . '_'. $action . '_' . $thresholdLevel;
         if (isset($this->forbiddenFieldsCache[$key])) {
@@ -348,12 +408,17 @@ class Table
 
         $fieldTableQuickAccess = $this->data->fieldTableQuickAccess;
 
-        if (!isset($fieldTableQuickAccess->$scope) || !isset($fieldTableQuickAccess->$scope->fields) || !isset($fieldTableQuickAccess->$scope->fields->$action)) {
+        if (
+            !isset($fieldTableQuickAccess->$scope) || !isset($fieldTableQuickAccess->$scope->fields) ||
+            !isset($fieldTableQuickAccess->$scope->fields->$action)
+        ) {
             $this->forbiddenFieldsCache[$key] = [];
+
             return [];
         }
 
         $levelList = [];
+
         foreach ($this->fieldLevelList as $level) {
             if (array_search($level, $this->fieldLevelList) >= array_search($thresholdLevel, $this->fieldLevelList)) {
                 $levelList[] = $level;
@@ -363,9 +428,15 @@ class Table
         $fieldList = [];
 
         foreach ($levelList as $level) {
-            if (!isset($fieldTableQuickAccess->$scope->fields->$action->$level)) continue;
+            if (!isset($fieldTableQuickAccess->$scope->fields->$action->$level)) {
+                continue;
+            }
+
             foreach ($fieldTableQuickAccess->$scope->fields->$action->$level as $field) {
-                if (in_array($field, $fieldList)) continue;
+                if (in_array($field, $fieldList)) {
+                    continue;
+                }
+
                 $fieldList[] = $field;
             }
         }
@@ -390,6 +461,7 @@ class Table
             foreach ($this->fieldActionList as $action) {
                 $fieldTableQuickAccess->$scope->attributes->$action = (object) [];
                 $fieldTableQuickAccess->$scope->fields->$action = (object) [];
+
                 foreach ($this->fieldLevelList as $level) {
                     $fieldTableQuickAccess->$scope->attributes->$action->$level = [];
                     $fieldTableQuickAccess->$scope->fields->$action->$level = [];
@@ -397,13 +469,17 @@ class Table
             }
 
             foreach (get_object_vars($scopeData) as $field => $fieldData) {
-                $attributeList = $this->getFieldManager()->getAttributeList($scope, $field);
+                $attributeList = $this->getFieldUtil()->getAttributeList($scope, $field);
 
                 foreach ($this->fieldActionList as $action) {
-                    if (!isset($fieldData->$action)) continue;
+                    if (!isset($fieldData->$action)) {
+                        continue;
+                    }
+
                     foreach ($this->fieldLevelList as $level) {
                         if ($fieldData->$action === $level) {
                             $fieldTableQuickAccess->$scope->fields->$action->{$level}[] = $field;
+
                             foreach ($attributeList as $attribute) {
                                 $fieldTableQuickAccess->$scope->attributes->$action->{$level}[] = $attribute;
                             }
@@ -423,6 +499,7 @@ class Table
         }
 
         $defaultsGroupName = 'default';
+
         if ($this->isStrictMode) {
             $defaultsGroupName = 'strictDefault';
         }
@@ -430,33 +507,53 @@ class Table
         $data = $this->metadata->get(['app', $this->type, $defaultsGroupName, 'scopeLevel'], []);
 
         foreach ($data as $scope => $item) {
-            if (isset($table->$scope)) continue;
+            if (isset($table->$scope)) {
+                continue;
+            }
+
             $value = $item;
+
             if (is_array($item)) {
                 $value = (object) $item;
             }
+
             $table->$scope = $value;
         }
 
         $defaultFieldData = $this->metadata->get(['app', $this->type, $defaultsGroupName, 'fieldLevel'], []);
 
         foreach ($this->getScopeList() as $scope) {
-            if (isset($table->$scope) && $table->$scope === false) continue;
-            if (!$this->getMetadata()->get('scopes.' . $scope . '.entity')) continue;
+            if (isset($table->$scope) && $table->$scope === false) {
+                continue;
+            }
+
+            if (!$this->getMetadata()->get('scopes.' . $scope . '.entity')) {
+                continue;
+            }
 
             $fieldList = array_keys($this->getMetadata()->get("entityDefs.{$scope}.fields", []));
 
-            $defaultScopeFieldData = $this->metadata->get('app.'.$this->type.'.'.$defaultsGroupName.'.scopeFieldLevel.' . $scope, []);
+            $defaultScopeFieldData = $this->metadata->get(
+                'app.'.$this->type.'.'.$defaultsGroupName.'.scopeFieldLevel.' . $scope, []);
 
             foreach (array_merge($defaultFieldData, $defaultScopeFieldData) as $field => $f) {
-                if (!in_array($field, $fieldList)) continue;
+                if (!in_array($field, $fieldList)) {
+                    continue;
+                }
+
                 if (!isset($fieldTable->$scope)) {
                     $fieldTable->$scope = (object) [];
                 }
-                if (isset($fieldTable->$scope->$field)) continue;
+
+                if (isset($fieldTable->$scope->$field)) {
+                    continue;
+                }
+
                 $fieldTable->$scope->$field = (object) [];
+
                 foreach ($this->fieldActionList as $action) {
                     $level = 'no';
+
                     if ($f === true) {
                         $level = 'yes';
                     } else {
@@ -472,22 +569,32 @@ class Table
         foreach ($this->getScopeWithAclList() as $scope) {
             if (!isset($table->$scope)) {
                 $aclType = $this->metadata->get('scopes.' . $scope . '.' . $this->type);
+
                 if ($aclType === true) {
                     $aclType = $this->defaultAclType;
                 }
+
                 if (!empty($aclType)) {
                     $paramDefaultsName = 'scopeLevelTypesDefaults';
+
                     if ($this->isStrictMode) {
                         $paramDefaultsName = 'scopeLevelTypesStrictDefaults';
                     }
-                    $defaultValue = $this->metadata->get(['app', $this->type, $paramDefaultsName, $aclType], $this->metadata->get(['app', $this->type, $paramDefaultsName, 'record']));
+
+                    $defaultValue = $this->metadata->get(
+                        ['app', $this->type, $paramDefaultsName, $aclType],
+                        $this->metadata->get(['app', $this->type, $paramDefaultsName, 'record'])
+                    );
+
                     if (is_array($defaultValue)) {
                         $defaultValue = (object) $defaultValue;
                     }
+
                     $table->$scope = $defaultValue;
 
                     if (is_object($table->$scope)) {
                         $actionList = $this->getMetadata()->get(['scopes', $scope, $this->type . 'ActionList']);
+
                         if ($actionList) {
                             foreach (get_object_vars($table->$scope) as $action => $level) {
                                 if (!in_array($action, $actionList)) {
@@ -511,30 +618,43 @@ class Table
 
         foreach ($data as $scope => $item) {
             $value = $item;
+
             if (is_array($item)) {
                 $value = (object) $item;
             }
+
             $table->$scope = $value;
         }
 
         $mandatoryFieldData = $this->metadata->get('app.'.$this->type.'.mandatory.fieldLevel', array());
 
         foreach ($this->getScopeList() as $scope) {
-            if (isset($table->$scope) && $table->$scope === false) continue;
-            if (!$this->getMetadata()->get('scopes.' . $scope . '.entity')) continue;
+            if (isset($table->$scope) && $table->$scope === false) {
+                continue;
+            }
+
+            if (!$this->getMetadata()->get('scopes.' . $scope . '.entity')) {
+                continue;
+            }
 
             $fieldList = array_keys($this->getMetadata()->get("entityDefs.{$scope}.fields", []));
 
             $mandatoryScopeFieldData = $this->metadata->get('app.'.$this->type.'.mandatory.scopeFieldLevel.' . $scope, array());
 
             foreach (array_merge($mandatoryFieldData, $mandatoryScopeFieldData) as $field => $f) {
-                if (!in_array($field, $fieldList)) continue;
+                if (!in_array($field, $fieldList)) {
+                    continue;
+                }
+
                 if (!isset($fieldTable->$scope)) {
                     $fieldTable->$scope = (object) [];
                 }
+
                 $fieldTable->$scope->$field = (object) [];
+
                 foreach ($this->fieldActionList as $action) {
                     $level = 'no';
+
                     if ($f === true) {
                         $level = 'yes';
                     } else {
@@ -569,6 +689,7 @@ class Table
                 $table->$scope = false;
                 unset($fieldTable->$scope);
             }
+
             foreach ($this->valuePermissionList as $permission) {
                 $valuePermissionLists->{$permission}[] = 'no';
             }
@@ -578,29 +699,38 @@ class Table
     private function mergeValueList(array $list, $defaultValue)
     {
         $result = null;
+
         foreach ($list as $level) {
             if ($level != 'not-set') {
                 if (is_null($result)) {
                     $result = $level;
                     continue;
                 }
+
                 if (array_search($result, $this->levelList) > array_search($level, $this->levelList)) {
                     $result = $level;
                 }
             }
         }
+
         if (is_null($result)) {
             $result = $defaultValue;
         }
+
         return $result;
     }
 
     protected function getScopeWithAclList()
     {
         $scopeList = [];
+
         $scopes = $this->metadata->get('scopes');
+
         foreach ($scopes as $scope => $d) {
-        	if (empty($d['acl'])) continue;
+        	if (empty($d['acl'])) {
+                continue;
+            }
+
         	$scopeList[] = $scope;
         }
         return $scopeList;
@@ -609,10 +739,13 @@ class Table
     protected function getScopeList()
     {
         $scopeList = [];
+
         $scopes = $this->metadata->get('scopes');
+
         foreach ($scopes as $scope => $d) {
             $scopeList[] = $scope;
         }
+
         return $scopeList;
     }
 
@@ -623,7 +756,9 @@ class Table
 
         foreach ($tableList as $table) {
             foreach ($scopeList as $scope) {
-            	if (!isset($table->$scope)) continue;
+            	if (!isset($table->$scope)) {
+                    continue;
+                }
 
             	$row = $table->$scope;
 
@@ -631,9 +766,11 @@ class Table
                     if (!isset($data->$scope)) {
                         $data->$scope = false;
                     }
-                } else if ($row === true) {
+                }
+                else if ($row === true) {
                     $data->$scope = true;
-                } else {
+                }
+                else {
                     if (!isset($data->$scope)) {
                         $data->$scope = (object) [];
                     }
@@ -641,7 +778,9 @@ class Table
                         $data->$scope = (object) [];
                     }
 
-                    if (!is_object($row)) continue;
+                    if (!is_object($row)) {
+                        continue;
+                    }
 
                     $actionList = $this->getMetadata()->get(['scopes', $scope, $this->type . 'ActionList'], $this->actionList);
 
@@ -651,7 +790,9 @@ class Table
                             if (!isset($data->$scope->$action)) {
                                 $data->$scope->$action = $level;
                             } else {
-                                if (array_search($data->$scope->$action, $this->levelList) > array_search($level, $this->levelList)) {
+                                if (
+                                    array_search($data->$scope->$action, $this->levelList) > array_search($level, $this->levelList)
+                                ) {
                                     $data->$scope->$action = $level;
                                 }
                             }
@@ -679,37 +820,54 @@ class Table
     private function mergeFieldTableList(array $tableList)
     {
         $data = (object) [];
+
         $scopeList = $this->getScopeWithAclList();
 
         foreach ($tableList as $table) {
             foreach ($scopeList as $scope) {
-                if (!isset($table->$scope)) continue;
+                if (!isset($table->$scope)) {
+                    continue;
+                }
 
                 if (!isset($data->$scope)) {
                     $data->$scope = (object) [];
                 }
 
-                if (!is_object($table->$scope)) continue;
+                if (!is_object($table->$scope)) {
+                    continue;
+                }
 
                 $fieldList = array_keys($this->getMetadata()->get("entityDefs.{$scope}.fields", []));
 
                 foreach (get_object_vars($table->$scope) as $field => $row) {
-                    if (!is_object($row)) continue;
+                    if (!is_object($row)) {
+                        continue;
+                    }
 
-                    if (!in_array($field, $fieldList)) continue;
+                    if (!in_array($field, $fieldList)) {
+                        continue;
+                    }
 
                     if (!isset($data->$scope->$field)) {
                         $data->$scope->$field = (object) [];
                     }
 
                     foreach ($this->fieldActionList as $i => $action) {
-                        if (!isset($row->$action)) continue;
+                        if (!isset($row->$action)) {
+                            continue;
+                        }
 
                         $level = $row->$action;
+
                         if (!isset($data->$scope->$field->$action)) {
                             $data->$scope->$field->$action = $level;
                         } else {
-                            if (array_search($data->$scope->$field->$action, $this->fieldLevelList) > array_search($level, $this->fieldLevelList)) {
+                            if (
+                                array_search(
+                                    $data->$scope->$field->$action,
+                                    $this->fieldLevelList
+                                ) > array_search($level, $this->fieldLevelList)
+                            ) {
                                 $data->$scope->$field->$action = $level;
                             }
                         }
@@ -723,30 +881,6 @@ class Table
 
     private function buildCache()
     {
-        $this->fileManager->putPhpContents($this->cacheFilePath, $this->data, true);
-    }
-
-    protected function applyReadOnlyFields(&$fieldTable)
-    {
-        // TODO Enable in 5.4.0
-        return;
-        $scopeList = $this->getScopeWithAclList();
-        foreach ($scopeList as $scope) {
-            if (!property_exists($fieldTable, $scope)) continue;
-            $fieldList = array_keys($this->getMetadata()->get(['entityDefs', $scope, 'fields'], []));
-            foreach ($fieldList as $field) {
-                if ($this->getMetadata()->get(['entityDefs', $scope, 'fields', $field, 'readOnly'])) {
-                    if (property_exists($fieldTable->$scope, $field)) {
-                        $fieldTable->$scope->$field->edit = 'no';
-                    } else {
-                        $fieldTable->$scope->$field = (object) [];
-                        foreach ($this->fieldActionList as $action) {
-                            $fieldTable->$scope->$field->$action = 'yes';
-                        }
-                        $fieldTable->$scope->$field->edit = 'no';
-                    }
-                }
-            }
-        }
+        $this->dataCache->store($this->cacheKey, $this->data);
     }
 }

application/Espo/Core/AclManager.php

@@ -29,79 +29,78 @@
 
 namespace Espo\Core;
 
-use \Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Error;
 
-use \Espo\ORM\Entity;
-use \Espo\Entities\User;
-use \Espo\Core\Utils\Util;
+use Espo\ORM\Entity;
+use Espo\Entities\User;
 
+use Espo\Core\{
+    Utils\ClassFinder,
+    Utils\Config,
+    ORM\EntityManager,
+    Acl\Acl as BaseAcl,
+    Acl\ScopeAcl,
+    Acl\GlobalRestricton,
+    Acl as UserAclWrapper,
+    Acl\Table as AclTable,
+    Utils\Util,
+};
+
+use StdClass;
+
+/**
+ * Used to check access for a specific user.
+ */
 class AclManager
 {
-    private $container;
-
-    private $metadata;
-
     private $implementationHashMap = [];
 
     private $tableHashMap = [];
 
-    protected $tableClassName = '\\Espo\\Core\\Acl\\Table';
+    protected $tableClassName = AclTable::class;
 
-    protected $userAclClassName = '\\Espo\\Core\\Acl';
+    protected $userAclClassName = UserAclWrapper::class;
+
+    protected $baseImplementationClassName = BaseAcl::class;
 
     protected $globalRestricton;
 
-    public function __construct(Container $container)
-    {
-        $this->container = $container;
-        $this->metadata = $container->get('metadata');
+    protected $injectableFactory;
+    protected $classFinder;
+    protected $config;
+    protected $entityManager;
 
-        $this->globalRestricton = new \Espo\Core\Acl\GlobalRestricton(
-            $container->get('metadata'),
-            $container->get('fileManager'),
-            $container->get('fieldManagerUtil'),
-            $container->get('config')->get('useCache')
-        );
+    public function __construct(
+        InjectableFactory $injectableFactory, ClassFinder $classFinder, Config $config, EntityManager $entityManager
+    ) {
+        $this->injectableFactory = $injectableFactory;
+        $this->classFinder = $classFinder;
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+
+        $this->globalRestricton = $this->injectableFactory->createWith(GlobalRestricton::class, [
+            'useCache' => $config->get('useCache'),
+        ]);
     }
 
-    protected function getContainer()
-    {
-        return $this->container;
-    }
-
-    protected function getMetadata()
-    {
-        return $this->metadata;
-    }
-
-    public function getImplementation($scope)
+    public function getImplementation(string $scope) : ScopeAcl
     {
         if (empty($this->implementationHashMap[$scope])) {
-            $normalizedName = Util::normilizeClassName($scope);
+            $className = $this->classFinder->find('Acl', $scope);
+
+            if (!$className) {
+                $className = $this->baseImplementationClassName;
+            }
 
-            $className = '\\Espo\\Custom\\Acl\\' . $normalizedName;
             if (!class_exists($className)) {
-                $moduleName = $this->metadata->getScopeModuleName($scope);
-                if ($moduleName) {
-                    $className = '\\Espo\\Modules\\' . $moduleName . '\\Acl\\' . $normalizedName;
-                } else {
-                    $className = '\\Espo\\Acl\\' . $normalizedName;
-                }
-                if (!class_exists($className)) {
-                    $className = '\\Espo\\Core\\Acl\\Base';
-                }
+                throw new Error("{$className} does not exist.");
             }
 
-            if (class_exists($className)) {
-                $acl = new $className($scope);
-                $dependencyList = $acl->getDependencyList();
-                foreach ($dependencyList as $name) {
-                    $acl->inject($name, $this->getContainer()->get($name));
-                }
-                $this->implementationHashMap[$scope] = $acl;
-            } else {
-                throw new Error();
-            }
+            $acl = $this->injectableFactory->createWith($className, [
+                'scope' => $scope,
+            ]);
+
+            $this->implementationHashMap[$scope] = $acl;
         }
 
         return $this->implementationHashMap[$scope];
@@ -110,80 +109,115 @@ class AclManager
     protected function getTable(User $user)
     {
         $key = $user->id;
+
         if (empty($key)) {
             $key = spl_object_hash($user);
         }
 
         if (empty($this->tableHashMap[$key])) {
-            $config = $this->getContainer()->get('config');
-            $fileManager = $this->getContainer()->get('fileManager');
-            $metadata = $this->getContainer()->get('metadata');
-            $fieldManager = $this->getContainer()->get('fieldManagerUtil');
-
-            $this->tableHashMap[$key] = new $this->tableClassName($user, $config, $fileManager, $metadata, $fieldManager);
+            $this->tableHashMap[$key] = $this->injectableFactory->createWith($this->tableClassName, [
+                'user' => $user,
+            ]);
         }
 
         return $this->tableHashMap[$key];
     }
 
-    public function getMap(User $user)
+    public function getMap(User $user) : StdClass
     {
         return $this->getTable($user)->getMap();
     }
 
-    public function getLevel(User $user, $scope, $action)
+    /**
+     * Get an access level for a specific scope and action.
+     */
+    public function getLevel(User $user, string $scope, string $action) : string
     {
         if ($user->isAdmin()) {
             return $this->getTable($user)->getHighestLevel($scope, $action);
         }
+
         return $this->getTable($user)->getLevel($scope, $action);
     }
 
-    public function get(User $user, $permission)
+    /**
+     * Get a permission. E.g. 'assignment' permission.
+     */
+    public function get(User $user, string $permission) : ?string
     {
+        if (substr($permission, -10) !== 'Permission') {
+            $permission .= 'Permission';
+        }
+
         return $this->getTable($user)->get($permission);
     }
 
-    public function checkReadNo(User $user, $scope)
+    /**
+     * Whether there's no 'read' access for a specific scope.
+     */
+    public function checkReadNo(User $user, string $scope) : bool
     {
         if ($user->isAdmin()) {
             return false;
         }
+
         $data = $this->getTable($user)->getScopeData($scope);
-        return $this->getImplementation($scope)->checkReadNo($user, $data);
+
+        return (bool) $this->getImplementation($scope)->checkReadNo($user, $data);
     }
 
-    public function checkReadOnlyTeam(User $user, $scope)
+    /**
+     * Whether 'read' access is set to 'team' for a specific scope.
+     */
+    public function checkReadOnlyTeam(User $user, string $scope) : bool
     {
         if ($user->isAdmin()) {
             return false;
         }
+
         $data = $this->getTable($user)->getScopeData($scope);
-        return $this->getImplementation($scope)->checkReadOnlyTeam($user, $data);
+
+        return (bool) $this->getImplementation($scope)->checkReadOnlyTeam($user, $data);
     }
 
-    public function checkReadOnlyOwn(User $user, $scope)
+    /**
+     * Whether 'read' access is set to 'own' for a specific scope.
+     */
+    public function checkReadOnlyOwn(User $user, string $scope) : bool
     {
         if ($user->isAdmin()) {
             return false;
         }
+
         $data = $this->getTable($user)->getScopeData($scope);
-        return $this->getImplementation($scope)->checkReadOnlyOwn($user, $data);
+
+        return (bool) $this->getImplementation($scope)->checkReadOnlyOwn($user, $data);
     }
 
-    public function check(User $user, $subject, $action = null)
+    /**
+     * Check a scope or entity. If $action is omitted, it will check whether a scope level is set to 'enabled'.
+     */
+    public function check(User $user, $subject, ?string $action = null) : bool
     {
         if (is_string($subject)) {
             return $this->checkScope($user, $subject, $action);
-        } else {
-            $entity = $subject;
-            if ($entity instanceof Entity) {
-                return $this->checkEntity($user, $entity, $action);
-            }
         }
+
+        $entity = $subject;
+
+        if ($entity instanceof Entity) {
+            $action = $action ?? 'read';
+
+            return $this->checkEntity($user, $entity, $action);
+        }
+
+        return false;
     }
 
-    public function checkEntity(User $user, Entity $entity, $action = 'read')
+    /**
+     * Check access to a specific entity (record).
+     */
+    public function checkEntity(User $user, Entity $entity, string $action = 'read') : bool
     {
         $scope = $entity->getEntityType();
 
@@ -197,60 +231,79 @@ class AclManager
 
         if ($action) {
             $methodName = 'checkEntity' . ucfirst($action);
+
             if (method_exists($impl, $methodName)) {
-                return $impl->$methodName($user, $entity, $data);
+                return (bool) $impl->$methodName($user, $entity, $data);
             }
         }
 
-        return $impl->checkEntity($user, $entity, $data, $action);
+        return (bool) $impl->checkEntity($user, $entity, $data, $action);
     }
 
-    public function checkIsOwner(User $user, Entity $entity)
+    /**
+     * Whether a user is owned of an entity (record). Usually 'assignedUser' field is used for checking.
+     */
+    public function checkIsOwner(User $user, Entity $entity) : bool
     {
-        return $this->getImplementation($entity->getEntityType())->checkIsOwner($user, $entity);
+        return (bool) $this->getImplementation($entity->getEntityType())->checkIsOwner($user, $entity);
     }
 
-    public function checkInTeam(User $user, Entity $entity)
+    /**
+     * Whether a user team list overlaps with teams set in an entity.
+     */
+    public function checkInTeam(User $user, Entity $entity) : bool
     {
-        return $this->getImplementation($entity->getEntityType())->checkInTeam($user, $entity);
+        return (bool) $this->getImplementation($entity->getEntityType())->checkInTeam($user, $entity);
     }
 
-    public function checkScope(User $user, $scope, $action = null)
+    /**
+     * Check access to scope. If $action is omitted, it will check whether a scope level is set to 'enabled'.
+     */
+    public function checkScope(User $user, string $scope, ?string $action = null) : bool
     {
         $data = $this->getTable($user)->getScopeData($scope);
-        return $this->getImplementation($scope)->checkScope($user, $data, $action);
+
+        return (bool) $this->getImplementation($scope)->checkScope($user, $data, $action);
     }
 
-    public function checkUser(User $user, $permission, User $entity)
+    /**
+     * @deprecated Use checkUserPermission instead.
+     */
+    public function checkUser(User $user, string $permission, User $target) : bool
     {
         if ($user->isAdmin()) {
             return true;
         }
+
         if ($this->get($user, $permission) === 'no') {
-            if ($entity->id !== $user->id) {
+            if ($target->id !== $user->id) {
                 return false;
             }
         } else if ($this->get($user, $permission) === 'team') {
-            if ($entity->id != $user->id) {
+            if ($target->id != $user->id) {
                 $teamIdList1 = $user->getTeamIdList();
-                $teamIdList2 = $entity->getTeamIdList();
+                $teamIdList2 = $target->getTeamIdList();
 
                 $inTeam = false;
+
                 foreach ($teamIdList1 as $id) {
                     if (in_array($id, $teamIdList2)) {
                         $inTeam = true;
+
                         break;
                     }
                 }
+
                 if (!$inTeam) {
                     return false;
                 }
             }
         }
+
         return true;
     }
 
-    protected function getGlobalRestrictionTypeList(User $user, $action = 'read')
+    protected function getGlobalRestrictionTypeList(User $user, string $action = 'read') : array
     {
         $typeList = ['forbidden'];
 
@@ -264,6 +317,7 @@ class AclManager
 
         if ($action === 'edit') {
             $typeList[] = 'readOnly';
+
             if (!$user->isAdmin()) {
                 $typeList[] = 'nonAdminReadOnly';
             }
@@ -272,8 +326,12 @@ class AclManager
         return $typeList;
     }
 
-    public function getScopeForbiddenAttributeList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
-    {
+    /**
+     * Get attributes forbidden for a user.
+     */
+    public function getScopeForbiddenAttributeList(
+        User $user, string $scope, string $action = 'read', string $thresholdLevel = 'no'
+    ) : array {
         $list = [];
 
         if (!$user->isAdmin()) {
@@ -285,14 +343,19 @@ class AclManager
                 $list,
                 $this->getScopeRestrictedAttributeList($scope, $this->getGlobalRestrictionTypeList($user, $action))
             );
+
             $list = array_values($list);
         }
 
         return $list;
     }
 
-    public function getScopeForbiddenFieldList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
-    {
+    /**
+     * Get fields forbidden for a user.
+     */
+    public function getScopeForbiddenFieldList(
+        User $user, string $scope, string $action = 'read', string $thresholdLevel = 'no'
+    ) : array {
         $list = [];
 
         if (!$user->isAdmin()) {
@@ -304,15 +367,19 @@ class AclManager
                 $list,
                 $this->getScopeRestrictedFieldList($scope, $this->getGlobalRestrictionTypeList($user, $action))
             );
+
             $list = array_values($list);
         }
 
         return $list;
     }
 
-
-    public function getScopeForbiddenLinkList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
-    {
+    /**
+     * Get links forbidden for a user.
+     */
+    public function getScopeForbiddenLinkList(
+        User $user, string $scope, string $action = 'read', string $thresholdLevel = 'no'
+    ) : array {
         $list = [];
 
         if ($thresholdLevel === 'no') {
@@ -320,13 +387,19 @@ class AclManager
                 $list,
                 $this->getScopeRestrictedLinkList($scope, $this->getGlobalRestrictionTypeList($user, $action))
             );
+
             $list = array_values($list);
         }
 
         return $list;
     }
 
-    public function checkUserPermission(User $user, $target, $permissionType = 'userPermission')
+    /**
+     * Whether a user has an access to another user over a specific permission.
+     *
+     * @param $target User|string User entity or user ID.
+     */
+    public function checkUserPermission(User $user, $target, string $permissionType = 'user') : bool
     {
         $permission = $this->get($user, $permissionType);
 
@@ -348,7 +421,8 @@ class AclManager
 
         if ($permission === 'team') {
             $teamIdList = $user->getLinkMultipleIdList('teams');
-            if (!$this->getContainer()->get('entityManager')->getRepository('User')->checkBelongsToAnyOfTeams($userId, $teamIdList)) {
+
+            if (!$this->entityManager->getRepository('User')->checkBelongsToAnyOfTeams($userId, $teamIdList)) {
                 return false;
             }
         }
@@ -356,57 +430,77 @@ class AclManager
         return true;
     }
 
-    public function checkAssignmentPermission(User $user, $target)
+    /**
+     * Whether a user can assign to another user.
+     *
+     * @param $target User|string User entity or user ID.
+     */
+    public function checkAssignmentPermission(User $user, $target) : bool
     {
-        return $this->checkUserPermission($user, $target, 'assignmentPermission');
+        return $this->checkUserPermission($user, $target, 'assignment');
     }
 
-    public function createUserAcl(User $user)
+    /**
+     * Create a wrapper for a specific user.
+     */
+    public function createUserAcl(User $user) : UserAclWrapper
     {
         $className = $this->userAclClassName;
         $acl = new $className($this, $user);
+
         return $acl;
     }
 
-    public function getScopeRestrictedFieldList($scope, $type)
+    public function getScopeRestrictedFieldList(string $scope, $type) : array
     {
         if (is_array($type)) {
             $typeList = $type;
             $list = [];
+
             foreach ($typeList as $type) {
                 $list = array_merge($list, $this->globalRestricton->getScopeRestrictedFieldList($scope, $type));
             }
+
             $list = array_values($list);
+
             return $list;
         }
         return $this->globalRestricton->getScopeRestrictedFieldList($scope, $type);
     }
 
-    public function getScopeRestrictedAttributeList($scope, $type)
+    public function getScopeRestrictedAttributeList(string $scope, $type) : array
     {
         if (is_array($type)) {
             $typeList = $type;
             $list = [];
+
             foreach ($typeList as $type) {
                 $list = array_merge($list, $this->globalRestricton->getScopeRestrictedAttributeList($scope, $type));
             }
+
             $list = array_values($list);
+
             return $list;
         }
+
         return $this->globalRestricton->getScopeRestrictedAttributeList($scope, $type);
     }
 
-    public function getScopeRestrictedLinkList($scope, $type)
+    public function getScopeRestrictedLinkList(string $scope, $type) : array
     {
         if (is_array($type)) {
             $typeList = $type;
             $list = [];
+
             foreach ($typeList as $type) {
                 $list = array_merge($list, $this->globalRestricton->getScopeRestrictedLinkList($scope, $type));
             }
+
             $list = array_values($list);
+
             return $list;
         }
+
         return $this->globalRestricton->getScopeRestrictedLinkList($scope, $type);
     }
 }

application/Espo/Core/AclPortal/Acl.php

@@ -0,0 +1,37 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\AclPortal;
+
+use Espo\Core\Acl\Acl as BaseAcl;
+
+class Acl extends BaseAcl implements PortalScopeAcl
+{
+    use Portal;
+}

application/Espo/Core/AclPortal/Base.php

@@ -29,188 +29,9 @@
 
 namespace Espo\Core\AclPortal;
 
-use \Espo\Entities\User;
-use \Espo\ORM\Entity;
 
-class Base extends \Espo\Core\Acl\Base
+/** @deprecated */
+class Base extends \Espo\Core\Acl\Base implements PortalScopeAcl
 {
-    public function checkScope(User $user, $data, $action = null, Entity $entity = null, $entityAccessData = array())
-    {
-        if ($user->isAdmin()) {
-            return true;
-        }
-
-        if (is_null($data)) {
-            return false;
-        }
-        if ($data === false) {
-            return false;
-        }
-        if ($data === true) {
-            return true;
-        }
-        if (is_string($data)) {
-            return true;
-        }
-
-        $isOwner = null;
-        if (isset($entityAccessData['isOwner'])) {
-            $isOwner = $entityAccessData['isOwner'];
-        }
-        $inAccount = null;
-        if (isset($entityAccessData['inAccount'])) {
-            $inAccount = $entityAccessData['inAccount'];
-        }
-        $isOwnContact = null;
-        if (isset($entityAccessData['isOwnContact'])) {
-            $isOwnContact = $entityAccessData['isOwnContact'];
-        }
-
-        if (is_null($action)) {
-            return true;
-        }
-
-        if (!isset($data->$action)) {
-            return false;
-        }
-
-        $value = $data->$action;
-
-        if ($value === 'all' || $value === 'yes' || $value === true) {
-            return true;
-        }
-
-        if (!$value || $value === 'no') {
-            return false;
-        }
-
-        if (is_null($isOwner)) {
-            if ($entity) {
-                $isOwner = $this->checkIsOwner($user, $entity);
-            } else {
-                return true;
-            }
-        }
-
-        if ($isOwner) {
-            if ($value === 'own' || $value === 'account' || $value === 'contact') {
-                return true;
-            }
-        }
-
-        if ($value === 'account') {
-            if (is_null($inAccount) && $entity) {
-                $inAccount = $this->checkInAccount($user, $entity);
-            }
-            if ($inAccount) {
-                return true;
-            } else {
-                if (is_null($isOwnContact) && $entity) {
-                    $isOwnContact = $this->checkIsOwnContact($user, $entity);
-                }
-                if ($isOwnContact) {
-                    return true;
-                }
-            }
-        }
-
-        if ($value === 'contact') {
-            if (is_null($isOwnContact) && $entity) {
-                $isOwnContact = $this->checkIsOwnContact($user, $entity);
-            }
-            if ($isOwnContact) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function checkReadOnlyAccount(User $user, $data)
-    {
-        if (empty($data) || !is_object($data) || !isset($data->read)) {
-            return false;
-        }
-        return $data->read === 'account';
-    }
-
-    public function checkReadOnlyContact(User $user, $data)
-    {
-        if (empty($data) || !is_object($data) || !isset($data->read)) {
-            return false;
-        }
-        return $data->read === 'contact';
-    }
-
-    public function checkIsOwner(User $user, Entity $entity)
-    {
-        if ($entity->hasAttribute('createdById')) {
-            if ($entity->has('createdById')) {
-                if ($user->id === $entity->get('createdById')) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    public function checkInAccount(User $user, Entity $entity)
-    {
-        $accountIdList = $user->getLinkMultipleIdList('accounts');
-        if (count($accountIdList)) {
-            if ($entity->hasAttribute('accountId') && $entity->getRelationParam('account', 'entity') === 'Account') {
-                if (in_array($entity->get('accountId'), $accountIdList)) {
-                    return true;
-                }
-            }
-
-            if ($entity->hasRelation('accounts') && $entity->getRelationParam('accounts', 'entity') === 'Account') {
-                $repository = $this->getEntityManager()->getRepository($entity->getEntityType());
-                foreach ($accountIdList as $accountId) {
-                    if ($repository->isRelated($entity, 'accounts', $accountId)) {
-                        return true;
-                    }
-                }
-            }
-
-            if ($entity->hasAttribute('parentId') && $entity->hasRelation('parent')) {
-                if ($entity->get('parentType') === 'Account') {
-                    if (in_array($entity->get('parentId'), $accountIdList)) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public function checkIsOwnContact(User $user, Entity $entity)
-    {
-        $contactId = $user->get('contactId');
-        if ($contactId) {
-            if ($entity->hasAttribute('contactId') && $entity->getRelationParam('contact', 'entity') === 'Contact') {
-                if ($entity->get('contactId') === $contactId) {
-                    return true;
-                }
-            }
-
-            if ($entity->hasRelation('contacts') && $entity->getRelationParam('contacts', 'entity') === 'Contact') {
-                $repository = $this->getEntityManager()->getRepository($entity->getEntityType());
-                if ($repository->isRelated($entity, 'contacts', $contactId)) {
-                    return true;
-                }
-            }
-
-            if ($entity->hasAttribute('parentId') && $entity->hasRelation('parent')) {
-                if ($entity->get('parentType') === 'Contact') {
-                    if ($entity->get('parentId') === $contactId) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
+    use Portal;
 }

application/Espo/Core/AclPortal/Portal.php

@@ -0,0 +1,216 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\AclPortal;
+
+use Espo\Entities\User;
+use Espo\ORM\Entity;
+
+trait Portal
+{
+    public function checkScope(User $user, $data, $action = null, Entity $entity = null, $entityAccessData = [])
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if (is_null($data)) {
+            return false;
+        }
+        if ($data === false) {
+            return false;
+        }
+        if ($data === true) {
+            return true;
+        }
+        if (is_string($data)) {
+            return true;
+        }
+
+        $isOwner = null;
+        if (isset($entityAccessData['isOwner'])) {
+            $isOwner = $entityAccessData['isOwner'];
+        }
+        $inAccount = null;
+        if (isset($entityAccessData['inAccount'])) {
+            $inAccount = $entityAccessData['inAccount'];
+        }
+        $isOwnContact = null;
+        if (isset($entityAccessData['isOwnContact'])) {
+            $isOwnContact = $entityAccessData['isOwnContact'];
+        }
+
+        if (is_null($action)) {
+            return true;
+        }
+
+        if (!isset($data->$action)) {
+            return false;
+        }
+
+        $value = $data->$action;
+
+        if ($value === 'all' || $value === 'yes' || $value === true) {
+            return true;
+        }
+
+        if (!$value || $value === 'no') {
+            return false;
+        }
+
+        if (is_null($isOwner)) {
+            if ($entity) {
+                $isOwner = $this->checkIsOwner($user, $entity);
+            } else {
+                return true;
+            }
+        }
+
+        if ($isOwner) {
+            if ($value === 'own' || $value === 'account' || $value === 'contact') {
+                return true;
+            }
+        }
+
+        if ($value === 'account') {
+            if (is_null($inAccount) && $entity) {
+                $inAccount = $this->checkInAccount($user, $entity);
+            }
+            if ($inAccount) {
+                return true;
+            } else {
+                if (is_null($isOwnContact) && $entity) {
+                    $isOwnContact = $this->checkIsOwnContact($user, $entity);
+                }
+                if ($isOwnContact) {
+                    return true;
+                }
+            }
+        }
+
+        if ($value === 'contact') {
+            if (is_null($isOwnContact) && $entity) {
+                $isOwnContact = $this->checkIsOwnContact($user, $entity);
+            }
+            if ($isOwnContact) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function checkReadOnlyAccount(User $user, $data)
+    {
+        if (empty($data) || !is_object($data) || !isset($data->read)) {
+            return false;
+        }
+        return $data->read === 'account';
+    }
+
+    public function checkReadOnlyContact(User $user, $data)
+    {
+        if (empty($data) || !is_object($data) || !isset($data->read)) {
+            return false;
+        }
+        return $data->read === 'contact';
+    }
+
+    public function checkIsOwner(User $user, Entity $entity)
+    {
+        if ($entity->hasAttribute('createdById')) {
+            if ($entity->has('createdById')) {
+                if ($user->id === $entity->get('createdById')) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public function checkInAccount(User $user, Entity $entity)
+    {
+        $accountIdList = $user->getLinkMultipleIdList('accounts');
+        if (count($accountIdList)) {
+            if ($entity->hasAttribute('accountId') && $entity->getRelationParam('account', 'entity') === 'Account') {
+                if (in_array($entity->get('accountId'), $accountIdList)) {
+                    return true;
+                }
+            }
+
+            if ($entity->hasRelation('accounts') && $entity->getRelationParam('accounts', 'entity') === 'Account') {
+                $repository = $this->getEntityManager()->getRepository($entity->getEntityType());
+                foreach ($accountIdList as $accountId) {
+                    if ($repository->isRelated($entity, 'accounts', $accountId)) {
+                        return true;
+                    }
+                }
+            }
+
+            if ($entity->hasAttribute('parentId') && $entity->hasRelation('parent')) {
+                if ($entity->get('parentType') === 'Account') {
+                    if (in_array($entity->get('parentId'), $accountIdList)) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public function checkIsOwnContact(User $user, Entity $entity)
+    {
+        $contactId = $user->get('contactId');
+        if ($contactId) {
+            if ($entity->hasAttribute('contactId') && $entity->getRelationParam('contact', 'entity') === 'Contact') {
+                if ($entity->get('contactId') === $contactId) {
+                    return true;
+                }
+            }
+
+            if ($entity->hasRelation('contacts') && $entity->getRelationParam('contacts', 'entity') === 'Contact') {
+                $repository = $this->getEntityManager()->getRepository($entity->getEntityType());
+                if ($repository->isRelated($entity, 'contacts', $contactId)) {
+                    return true;
+                }
+            }
+
+            if ($entity->hasAttribute('parentId') && $entity->hasRelation('parent')) {
+                if ($entity->get('parentType') === 'Contact') {
+                    if ($entity->get('parentId') === $contactId) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+}

application/Espo/Core/AclPortal/PortalScopeAcl.php

@@ -27,10 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Interfaces;
+namespace Espo\Core\AclPortal;
 
-interface InjectableService
+interface PortalScopeAcl
 {
-    public function inject(string $name, object $object);
-}
 
+}

application/Espo/Core/AclPortal/Table.php

@@ -29,16 +29,24 @@
 
 namespace Espo\Core\AclPortal;
 
-use \Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Error;
 
-use \Espo\ORM\Entity;
-use \Espo\Entities\User;
-use \Espo\Entities\Portal;
+use Espo\Entities\{
+    User,
+    Portal,
+};
 
-use \Espo\Core\Utils\Config;
-use \Espo\Core\Utils\Metadata;
-use \Espo\Core\Utils\FieldManagerUtil;
-use \Espo\Core\Utils\File\Manager as FileManager;
+use Espo\Core\{
+    ORM\EntityManager,
+    ORM\Entity,
+    Utils\Config,
+    Utils\Metadata,
+    Utils\FieldUtil,
+    Utils\File\Manager as FileManager,
+    Utils\DataCache,
+};
+
+use Traversable;
 
 class Table extends \Espo\Core\Acl\Table
 {
@@ -52,13 +60,22 @@ class Table extends \Espo\Core\Acl\Table
 
     protected $isStrictModeForced = true;
 
-    public function __construct(User $user, Portal $portal, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManagerUtil $fieldManager = null)
-    {
+    public function __construct(
+        EntityManager $entityManager,
+        User $user,
+        Portal $portal,
+        Config $config = null,
+        Metadata $metadata = null,
+        FieldUtil $fieldUtil = null,
+        DataCache $dataCache
+    ) {
         if (empty($portal)) {
             throw new Error("No portal was passed to AclPortal\\Table constructor.");
         }
+
         $this->portal = $portal;
-        parent::__construct($user, $config, $fileManager, $metadata, $fieldManager);
+
+        parent::__construct($entityManager, $user, $config, $metadata, $fieldUtil, $dataCache);
     }
 
     protected function getPortal()
@@ -66,27 +83,37 @@ class Table extends \Espo\Core\Acl\Table
         return $this->portal;
     }
 
-    protected function initCacheFilePath()
+    protected function initCacheKey()
     {
-        $this->cacheFilePath = 'data/cache/application/acl-portal/'.$this->getPortal()->id.'/' . $this->getUser()->id . '.php';
+        $this->cacheKey = 'aclPortal/' . $this->getPortal()->id.'/' . $this->getUser()->id;
     }
 
     protected function getRoleList()
     {
         $roleList = [];
 
-        $userRoleList = $this->getUser()->get('portalRoles');
-        if (!(is_array($userRoleList) || $userRoleList instanceof \Traversable)) {
+        $userRoleList = $this->entityManager
+            ->getRepository('User')
+            ->getRelation($this->getUser(), 'portalRoles')
+            ->find();
+
+        if (! $userRoleList instanceof Traversable) {
             throw new Error();
         }
+
         foreach ($userRoleList as $role) {
             $roleList[] = $role;
         }
 
-        $portalRoleList = $this->getPortal()->get('portalRoles');
-        if (!(is_array($portalRoleList) || $portalRoleList instanceof \Traversable)) {
+        $portalRoleList = $this->entityManager
+            ->getRepository('Portal')
+            ->getRelation($this->getPortal(), 'portalRoles')
+            ->find();
+
+        if (! $portalRoleList instanceof Traversable) {
             throw new Error();
         }
+
         foreach ($portalRoleList as $role) {
             $roleList[] = $role;
         }
@@ -132,4 +159,3 @@ class Table extends \Espo\Core\Acl\Table
     {
     }
 }
-