v

Bumps [async](https://github.com/caolan/async) from 2.6.2 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.2...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/test-integration.yml

@@ -0,0 +1,64 @@
+name: Test Integration
+
+on:
+  schedule:
+    - cron:  '0 10 * * *'
+
+jobs:
+  test:
+    name: Test on PHP ${{ matrix.php-versions }}
+    runs-on: ubuntu-20.04
+    env:
+      TEST_DATABASE_HOST: '127.0.0.1'
+      TEST_DATABASE_PORT: '8888'
+      TEST_DATABASE_NAME: integration_test
+      TEST_DATABASE_USER: root
+      TEST_DATABASE_PASSWORD: password
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: false
+          MYSQ_USER: root
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: integration_test
+        ports:
+          - '8888:3306'
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['7.4', '8.1']
+        branches: ['master']
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ matrix.branches }}
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: 16.x
+
+    - name: Setup PHP with Composer
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+        tools: composer:v2
+        ini-values: memory_limit=1024M
+
+    - name: Start MySQL service
+      run: sudo systemctl start mysql
+
+    - name: Create DB table
+      run: mysql -h 127.0.0.1 --port 8888 -u root -ppassword -e 'CREATE DATABASE IF NOT EXISTS integration_test;'
+
+    - name: NPM install
+      run: npm install
+
+    - name: Build
+      run: grunt test
+
+    - name: Integration testing
+      run: vendor/bin/phpunit tests/integration

.github/workflows/test.yml

@@ -0,0 +1,48 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'fix'
+    paths:
+      - '**.php'
+      - '**.json'
+      - '**.yml'
+      - 'composer.lock'
+      - 'phpstan.neon'
+
+  pull_request:
+    paths:
+      - '**.php'
+      - '**.json'
+      - '**.yml'
+      - 'composer.lock'
+      - 'phpstan.neon'
+
+jobs:
+  test:
+    name: Test on PHP ${{ matrix.php-versions }}
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        php-versions: ['7.4', '8.0', '8.1']
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup PHP with Composer
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+        tools: composer:v2
+        ini-values: memory_limit=1024M
+
+    - name: Composer install
+      run: composer install
+
+    - name: Static analysis
+      run: vendor/bin/phpstan
+
+    - name: Unit testing
+      run: vendor/bin/phpunit tests/unit

.gitignore

@@ -23,3 +23,7 @@
 !/custom/Espo/Custom/.htaccess
 !/custom/Espo/Modules/.htaccess
 /install/config.php
+
+client/css/espo/*
+client/lib/*
+client/modules/crm/lib/*

.npmrc

@@ -0,0 +1 @@
+tag-version-prefix = ""

Gruntfile.js

@@ -2,7 +2,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -20,12 +20,13 @@
  ************************************************************************/
 
 /**
-* * `grunt` - full build
-* * `grunt dev` - build only items needed for development (takes less time)
-* * `grunt offline` - build but skip *composer install*
-* * `grant release` - full build plus upgrade packages`
-* * `grant test` - build for tests running
-* * `grant run-tests` - build and run unit and integration tests
+* * `grunt` - full build;
+* * `grunt dev` - build only items needed for development (takes less time);
+* * `grunt offline` - build but skip *composer install*;
+* * `grunt internal` - build only libs and css;
+* * `grunt release` - full build plus upgrade packages`;
+* * `grunt test` - build for tests running;
+* * `grunt run-tests` - build and run unit and integration tests.
 */
 
 const fs = require('fs');
@@ -95,7 +96,12 @@ module.exports = grunt => {
         },
 
         clean: {
-            start: ['build/EspoCRM-*'],
+            start: [
+                'build/EspoCRM-*',
+                'client/lib/*',
+                'client/modules/crm/lib/*',
+                'client/css/espo/*',
+            ],
             final: ['build/tmp'],
             release: ['build/EspoCRM-' + pkg.version],
             beforeFinal: {
@@ -110,6 +116,7 @@ module.exports = grunt => {
                     'build/tmp/client/custom/*',
                     '!build/tmp/client/custom/modules',
                     'build/tmp/client/custom/modules/*',
+                    '!build/tmp/client/custom/modules/dummy.txt',
                 ]
             }
         },
@@ -135,7 +142,7 @@ module.exports = grunt => {
                     banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
                 },
                 files: {
-                    'build/tmp/client/espo.min.js': jsFilesToBundle,
+                    'client/lib/espo.min.js': jsFilesToBundle,
                 },
             },
             lib: {
@@ -147,7 +154,7 @@ module.exports = grunt => {
             options: {
                 mode: true,
             },
-            frontendFolders: {
+            frontend: {
                 expand: true,
                 cwd: 'client',
                 src: [
@@ -160,19 +167,13 @@ module.exports = grunt => {
                     'css/**',
                     'sounds/**',
                     'custom/**',
+                    'lib/**',
                 ],
                 dest: 'build/tmp/client',
             },
             frontendLib: {
                 files: jsFilesToCopy,
             },
-            frontendCommitedLib: {
-                expand: true,
-                dot: true,
-                cwd: 'client/lib',
-                src: '**',
-                dest: 'build/tmp/client/lib/',
-            },
             backend: {
                 expand: true,
                 dot: true,
@@ -211,60 +212,6 @@ module.exports = grunt => {
             },
         },
 
-        chmod: {
-            php: {
-                options: {
-                    mode: '644'
-                },
-                src: [
-                    'build/EspoCRM-<%= pkg.version %>/**/*.php',
-                    'build/EspoCRM-<%= pkg.version %>/**/*.json',
-                    'build/EspoCRM-<%= pkg.version %>/**/*.config',
-                    'build/EspoCRM-<%= pkg.version %>/**/.htaccess',
-                    'build/EspoCRM-<%= pkg.version %>/client/**/*.js',
-                    'build/EspoCRM-<%= pkg.version %>/client/**/*.css',
-                    'build/EspoCRM-<%= pkg.version %>/client/**/*.tpl',
-                    'build/EspoCRM-<%= pkg.version %>/**/*.html',
-                    'build/EspoCRM-<%= pkg.version %>/**/*.txt',
-                ],
-            },
-            folders: {
-                options: {
-                    mode: '755'
-                },
-                src: [
-                    'build/EspoCRM-<%= pkg.version %>/public/install',
-                    'build/EspoCRM-<%= pkg.version %>/public/portal',
-                    'build/EspoCRM-<%= pkg.version %>/public/api',
-                    'build/EspoCRM-<%= pkg.version %>/public/api/v1',
-                    'build/EspoCRM-<%= pkg.version %>/public/api/v1/portal-access',
-                    'build/EspoCRM-<%= pkg.version %>',
-                ],
-            },
-            foldersWritable: {
-                options: {
-                    mode: '775'
-                },
-                src: [
-                    'build/EspoCRM-<%= pkg.version %>/data',
-                    'build/EspoCRM-<%= pkg.version %>/custom',
-                    'build/EspoCRM-<%= pkg.version %>/custom/Espo',
-                    'build/EspoCRM-<%= pkg.version %>/custom/Espo/Custom',
-                    'build/EspoCRM-<%= pkg.version %>/client/custom',
-                    'build/EspoCRM-<%= pkg.version %>/client/modules',
-                    'build/EspoCRM-<%= pkg.version %>/application/Espo/Modules',
-                ]
-            },
-            executable: {
-                options: {
-                    mode: '754'
-                },
-                src: [
-                    'build/EspoCRM-<%= pkg.version %>/bin/*',
-                ],
-            },
-        },
-
         replace: {
             version: {
                 options: {
@@ -304,14 +251,106 @@ module.exports = grunt => {
 
     grunt.registerTask('chmod-folders', () => {
         cp.execSync(
-            "find . -type d -exec chmod 755 {} + ",
+            "find . -type d -exec chmod 755 {} +",
             {
-                stdio: 'ignore',
                 cwd: 'build/EspoCRM-' + pkg.version,
             }
         );
     });
 
+    grunt.registerTask('chmod-multiple', () => {
+        let dirPath = 'build/EspoCRM-' + pkg.version;
+
+        let fileList = [
+            {
+                name: '*.php',
+            },
+            {
+                name: '*.json',
+            },
+            {
+                name: '*.config',
+            },
+            {
+                name: '.htaccess',
+            },
+            {
+                name: '*.html',
+            },
+            {
+                name: '*.txt',
+            },
+            {
+                name: '*.js',
+                folder: 'client',
+            },
+            {
+                name: '*.css',
+                folder: 'client',
+            },
+            {
+                name: '*.tpl',
+                folder: 'client',
+            },
+        ];
+
+        let dirReadableList = [
+            'public/install',
+            'public/portal',
+            'public/api',
+            'public/api/v1',
+            'public/api/v1/portal-access',
+            '.',
+        ];
+
+        let dirWritableList = [
+            'data',
+            'custom',
+            'custom/Espo',
+            'custom/Espo/Custom',
+            'client/custom',
+            'client/modules',
+            'application/Espo/Modules',
+        ];
+
+        fileList.forEach(item => {
+            let path = item.folder || '.';
+            let name = item.name;
+
+            cp.execSync(
+                `find ${path} -type f -iname "${name}" -exec chmod 644 {} +`,
+                {
+                    cwd: dirPath,
+                }
+            );
+        });
+
+        dirReadableList.forEach(item => {
+            cp.execSync(
+                `chmod 755 ${item}`,
+                {
+                    cwd: dirPath,
+                }
+            );
+        });
+
+        dirWritableList.forEach(item => {
+            cp.execSync(
+                `chmod 775 ${item}`,
+                {
+                    cwd: dirPath,
+                }
+            );
+        });
+
+        cp.execSync(
+            `find bin -type f -exec chmod 754 {} +`,
+            {
+                cwd: dirPath,
+            }
+        );
+    });
+
     grunt.registerTask('composer-install', () => {
         cp.execSync("composer install --no-dev", {stdio: 'ignore'});
     });
@@ -332,6 +371,10 @@ module.exports = grunt => {
         cp.execSync("vendor/bin/phpunit ./tests/integration", {stdio: 'inherit'});
     });
 
+    grunt.registerTask('set-config-params', () => {
+        cp.execSync("composer run-script setConfigParams", {stdio: 'ignore'});
+    });
+
     grunt.registerTask('zip', () => {
         const archiver = require('archiver');
 
@@ -366,43 +409,43 @@ module.exports = grunt => {
     });
 
     grunt.registerTask('npm-install', () => {
-        cp.execSync("npm install", {stdio: 'ignore'});
+        cp.execSync("npm ci", {stdio: 'ignore'});
     });
 
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-mkdir');
     grunt.loadNpmTasks('grunt-contrib-less');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
-    grunt.loadNpmTasks('grunt-contrib-uglify-es');
+    grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-replace');
-    grunt.loadNpmTasks('grunt-chmod');
+
+    grunt.registerTask('internal', [
+        'less',
+        'cssmin',
+        'uglify:bundle',
+        'copy:frontendLib',
+        'uglify:lib',
+    ]);
 
     grunt.registerTask('offline', [
         'clean:start',
         'mkdir:tmp',
-        'less',
-        'cssmin',
-        'uglify:bundle',
-        'copy:frontendFolders',
-        'copy:frontendLib',
-        'copy:frontendCommitedLib',
+        'internal',
+        'copy:frontend',
         'copy:backend',
-        'uglify:lib',
         'replace',
         'clean:beforeFinal',
         'copy:final',
         'chmod-folders',
-        'chmod:php',
-        'chmod:folders',
-        'chmod:foldersWritable',
-        'chmod:executable',
+        'chmod-multiple',
         'clean:final',
     ]);
 
     grunt.registerTask('build', [
         'composer-install',
         'npm-install',
+        'set-config-params',
         'offline',
     ]);
 
@@ -486,10 +529,10 @@ function getCopyLibDataList() {
         let minify = item.minify;
 
         if (item.files) {
-            item.files.forEach(item  => {
+            item.files.forEach(item => {
                 list.push({
                     src: item.src,
-                    dest: 'build/tmp/' + (item.dest || 'client/lib/' + item.src.split('/').pop()),
+                    dest: item.dest || 'client/lib/' + item.src.split('/').pop(),
                     minify: minify,
                 });
             });
@@ -503,7 +546,7 @@ function getCopyLibDataList() {
 
         list.push({
             src: item.src,
-            dest: 'build/tmp/' + (item.dest || 'client/lib/' + item.src.split('/').pop()),
+            dest: item.dest || 'client/lib/' + item.src.split('/').pop(),
             minify: minify,
         });
     });

README.md

@@ -1,6 +1,8 @@
 ## EspoCRM
 
-[EspoCRM is an Open Source CRM](https://www.espocrm.com) (Customer Relationship Management) software that allows you to see, enter and evaluate all your company relationships regardless of the type. People, companies or opportunities - all in an easy and intuitive interface.
+[![PHPStan level 8](https://img.shields.io/badge/PHPStan-level%208-brightgreen)](#espocrm)
+
+[EspoCRM is an Open Source CRM](https://www.espocrm.com) (Customer Relationship Management) software that allows you to see, enter and evaluate all your company relationships regardless of the type. People, companies or opportunities – all in an easy and intuitive interface.
 
 It's a web application with a frontend designed as a single page application and REST API backend written in PHP.
 
@@ -8,22 +10,22 @@ It's a web application with a frontend designed as a single page application and
 
 ### Requirements
 
-* PHP 7.3 and later (with pdo, json, gd, openssl, zip, imap, mbstring, curl extensions);
+* PHP 7.4 and later (with pdo, json, gd, openssl, zip, imap, mbstring, curl extensions);
 * MySQL 5.7 (and later), or MariaDB 10.1 (and later).
 
 For more information about server configuration see [this article](https://docs.espocrm.com/administration/server-configuration/).
 
 ### Documentation
 
-Documentation for administrators, users and developers is available [here](https://docs.espocrm.com).
+The documentation for administrators, users and developers is available [here](https://docs.espocrm.com).
 
-### How to report a bug
+### Bug reporting
 
 Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our [forum](http://forum.espocrm.com/forum/bug-reports).
 
-### How to install a stable version
+### Installing the stable version
 
-[Download](https://www.espocrm.com/download/) the latest version. See the [instructions](https://docs.espocrm.com/administration/installation/) about installation.
+See the [instructions](https://docs.espocrm.com/administration/installation/) about installation.
 
 ### Development
 
@@ -31,13 +33,13 @@ Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our
 * [Running tests](https://docs.espocrm.com/development/tests)
 * [Making translation](https://docs.espocrm.com/development/translation)
 
-### How to contribute
+### Contributing
 
 Before we can merge your pull request you need to accept our CLA [here](https://github.com/espocrm/cla). It's very simple to do.
 
 Branches:
 
-* *hotfix/** – upcoming maintenance release; fixes should be pushed to this branch;
+* *fix* – upcoming maintenance release; fixes should be pushed to this branch;
 * *master* – develop branch; new features should be pushed to this branch;
 * *stable* – last stable release.
 

application/Espo/Classes/Acl/ActionHistoryRecord/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,6 +37,9 @@ use Espo\Core\{
     Acl\OwnershipOwnChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\ActionHistoryRecord>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

application/Espo/Classes/Acl/Attachment/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -32,6 +32,7 @@ namespace Espo\Classes\Acl\Attachment;
 use Espo\Entities\{
     User,
     Note,
+    Attachment,
 };
 
 use Espo\ORM\Entity;
@@ -45,6 +46,9 @@ use Espo\Core\{
     Acl\Traits\DefaultAccessCheckerDependency,
 };
 
+/**
+ * @implements AccessEntityCREDChecker<Attachment>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
@@ -65,26 +69,29 @@ class AccessChecker implements AccessEntityCREDChecker
 
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
     {
+        /** @var Attachment $entity */
+
         if ($entity->get('parentType') === 'Settings') {
+            // Allow the logo.
             return true;
         }
 
         $parent = null;
 
-        $hasParent = false;
+        $parentType = $entity->get('parentType');
+        $parentId = $entity->get('parentId');
 
-        if ($entity->get('parentId') && $entity->get('parentType')) {
-            $hasParent = true;
+        $relatedType = $entity->get('relatedType');
+        $relatedId = $entity->get('relatedId');
 
-            $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        if ($parentId && $parentType) {
+            $parent = $this->entityManager->getEntityById($parentType, $parentId);
         }
-        else if ($entity->get('relatedId') && $entity->get('relatedType')) {
-            $hasParent = true;
-
-            $parent = $this->entityManager->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
+        else if ($relatedId && $relatedType) {
+            $parent = $this->entityManager->getEntityById($relatedType, $relatedId);
         }
 
-        if (!$parent || !$hasParent) {
+        if (!$parent) {
             if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
                 return true;
             }
@@ -93,6 +100,7 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if ($parent->getEntityType() === 'Note') {
+            /** @var Note $parent */
             $result = $this->checkEntityReadNoteParent($user, $parent);
 
             if ($result !== null) {
@@ -100,6 +108,16 @@ class AccessChecker implements AccessEntityCREDChecker
             }
         }
         else if ($this->aclManager->checkEntity($user, $parent)) {
+            if (
+                $entity->getTargetField() &&
+                in_array(
+                    $entity->getTargetField(),
+                    $this->aclManager->getScopeForbiddenFieldList($user, $parent->getEntityType())
+                )
+            ) {
+                return false;
+            }
+
             return true;
         }
 
@@ -114,8 +132,8 @@ class AccessChecker implements AccessEntityCREDChecker
     {
         if ($note->getTargetType() === Note::TARGET_TEAMS) {
             $intersect = array_intersect(
-                $note->getLinkMultipleIdList('teams'),
-                $user->getLinkMultipleIdList('teams')
+                $note->getLinkMultipleIdList('teams') ?? [],
+                $user->getLinkMultipleIdList('teams') ?? []
             );
 
             if (count($intersect)) {

application/Espo/Classes/Acl/Attachment/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,6 +37,9 @@ use Espo\Core\{
     Acl\OwnershipOwnChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Attachment>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     private const ATTR_CREATED_BY_ID = 'createdById';

application/Espo/Classes/Acl/AuthToken/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -38,6 +38,9 @@ use Espo\Core\{
     Acl\Traits\DefaultAccessCheckerDependency,
 };
 
+/**
+ * @implements AccessEntityCREDChecker<\Espo\Entities\AuthToken>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;

application/Espo/Classes/Acl/Email/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,6 +30,7 @@
 namespace Espo\Classes\Acl\Email;
 
 use Espo\Entities\User;
+use Espo\Entities\Email;
 
 use Espo\ORM\Entity;
 
@@ -41,6 +42,9 @@ use Espo\Core\{
     Acl\Traits\DefaultAccessCheckerDependency,
 };
 
+/**
+ * @implements AccessEntityCREDSChecker<\Espo\Entities\Email>
+ */
 class AccessChecker implements AccessEntityCREDSChecker
 {
     use DefaultAccessCheckerDependency;
@@ -52,6 +56,8 @@ class AccessChecker implements AccessEntityCREDSChecker
 
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
     {
+        /** @var Email $entity */
+
         if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
             return true;
         }
@@ -79,6 +85,8 @@ class AccessChecker implements AccessEntityCREDSChecker
 
     public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
     {
+        /** @var Email $entity */
+
         if ($user->isAdmin()) {
             return true;
         }
@@ -96,6 +104,7 @@ class AccessChecker implements AccessEntityCREDSChecker
                 return true;
             }
 
+            /** @var string[] */
             $assignedUserIdList = $entity->getLinkMultipleIdList('assignedUsers');
 
             if (
@@ -126,4 +135,37 @@ class AccessChecker implements AccessEntityCREDSChecker
 
         return false;
     }
+
+    public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
+    {
+        /** @var Email $entity */
+
+        if (
+            $entity->getStatus() === Email::STATUS_DRAFT &&
+            $entity->getCreatedBy() &&
+            $entity->getCreatedBy()->getId() === $user->getId()
+        ) {
+            return true;
+        }
+
+        return $this->defaultAccessChecker->checkEntityEdit($user, $entity, $data);
+    }
+
+    public function checkEdit(User $user, ScopeData $data): bool
+    {
+        if ($data->getCreate() === Table::LEVEL_YES) {
+            return true;
+        }
+
+        return $this->defaultAccessChecker->checkEdit($user, $data);
+    }
+
+    public function checkDelete(User $user, ScopeData $data): bool
+    {
+        if ($data->getCreate() === Table::LEVEL_YES) {
+            return true;
+        }
+
+        return $this->defaultAccessChecker->checkDelete($user, $data);
+    }
 }

application/Espo/Classes/Acl/Email/AssignmentChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/Acl/Email/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,6 +30,7 @@
 namespace Espo\Classes\Acl\Email;
 
 use Espo\Entities\User;
+use Espo\Entities\Email;
 
 use Espo\ORM\Entity;
 
@@ -39,6 +40,10 @@ use Espo\Core\{
     Acl\OwnershipTeamChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Email>
+ * @implements OwnershipTeamChecker<\Espo\Entities\Email>
+ */
 class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 {
     private $defaultOwnershipChecker;
@@ -50,6 +55,8 @@ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 
     public function checkOwn(User $user, Entity $entity): bool
     {
+        /** @var Email $entity */
+
         if ($user->getId() === $entity->get('assignedUserId')) {
             return true;
         }

application/Espo/Classes/Acl/EmailFilter/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -38,6 +38,9 @@ use Espo\Core\{
     ORM\EntityManager,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\EmailFilter>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     private $entityManager;

application/Espo/Classes/Acl/Import/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -39,6 +39,10 @@ use Espo\Core\{
     Acl\AccessEntityDeleteChecker,
 };
 
+/**
+ * @implements AccessEntityReadChecker<\Espo\Entities\Import>
+ * @implements AccessEntityDeleteChecker<\Espo\Entities\Import>
+ */
 class AccessChecker implements AccessEntityReadChecker, AccessEntityDeleteChecker
 {
     public function check(User $user, ScopeData $data): bool

application/Espo/Classes/Acl/Note/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -46,6 +46,9 @@ use Espo\Core\{
 use DateTime;
 use Exception;
 
+/**
+ * @implements AccessEntityCREDChecker<\Espo\Entities\Note>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;

application/Espo/Classes/Acl/Note/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,11 +37,13 @@ use Espo\Core\{
     Acl\OwnershipOwnChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Note>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool
     {
-
         if ($entity->get('type') === 'Post' && $user->getId() === $entity->get('createdById')) {
             return true;
         }

application/Espo/Classes/Acl/Notification/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,6 +37,9 @@ use Espo\Core\{
     Acl\OwnershipOwnChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Notification>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

application/Espo/Classes/Acl/Portal/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -40,6 +40,9 @@ use Espo\Core\{
     AclManager,
 };
 
+/**
+ * @implements AccessEntityCREDChecker<\Espo\Entities\Portal>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;

application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -40,6 +40,9 @@ use Espo\Core\{
     Acl\Traits\DefaultAccessCheckerDependency,
 };
 
+/**
+ * @implements AccessEntityCREDChecker<\Espo\Entities\ScheduledJob>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;

application/Espo/Classes/Acl/Team/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,10 +37,14 @@ use Espo\Core\{
     Acl\OwnershipOwnChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Team>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool
     {
+        /** @var string[] */
         $userTeamIdList = $user->getLinkMultipleIdList('teams');
 
         return in_array($entity->getId(), $userTeamIdList);

application/Espo/Classes/Acl/User/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -42,6 +42,9 @@ use Espo\Core\{
     AclManager,
 };
 
+/**
+ * @implements AccessEntityCREDSChecker<User>
+ */
 class AccessChecker implements AccessEntityCREDSChecker
 {
     use DefaultAccessCheckerDependency;
@@ -62,6 +65,8 @@ class AccessChecker implements AccessEntityCREDSChecker
             return false;
         }
 
+        /** @var User $entity */
+
         if ($entity->isSuperAdmin() && !$user->isSuperAdmin()) {
             return false;
         }
@@ -71,6 +76,8 @@ class AccessChecker implements AccessEntityCREDSChecker
 
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
     {
+        /** @var User $entity */
+
         if ($entity->isPortal()) {
             if ($this->aclManager->getPermissionLevel($user, 'portal') === Table::LEVEL_YES) {
                 return true;
@@ -88,6 +95,8 @@ class AccessChecker implements AccessEntityCREDSChecker
 
     public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
     {
+        /** @var User $entity */
+
         if ($entity->isSystem()) {
             return false;
         }
@@ -107,6 +116,8 @@ class AccessChecker implements AccessEntityCREDSChecker
 
     public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
     {
+        /** @var User $entity */
+
         if (!$user->isAdmin()) {
             return false;
         }
@@ -124,6 +135,8 @@ class AccessChecker implements AccessEntityCREDSChecker
 
     public function checkEntityStream(User $user, Entity $entity, ScopeData $data): bool
     {
+        /** @var User $entity */
+
         return $this->aclManager->checkUserPermission($user, $entity, 'user');
     }
 }

application/Espo/Classes/Acl/User/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,14 +30,18 @@
 namespace Espo\Classes\Acl\User;
 
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\ORM\Entity as CoreEntity;
 
 use Espo\Core\{
     Acl\OwnershipOwnChecker,
     Acl\OwnershipTeamChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\User>
+ * @implements OwnershipTeamChecker<\Espo\Entities\User>
+ */
 class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 {
     public function checkOwn(User $user, Entity $entity): bool
@@ -47,9 +51,11 @@ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 
     public function checkTeam(User $user, Entity $entity): bool
     {
+        assert($entity instanceof CoreEntity);
+
         $intersect = array_intersect(
-            $user->getLinkMultipleIdList('teams'),
-            $entity->getLinkMultipleIdList('teams')
+            $user->getLinkMultipleIdList('teams') ?? [],
+            $entity->getLinkMultipleIdList('teams') ?? []
         );
 
         if (count($intersect)) {

application/Espo/Classes/Acl/Webhook/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -40,6 +40,9 @@ use Espo\Core\{
     Acl\Traits\DefaultAccessCheckerDependency,
 };
 
+/**
+ * @implements AccessEntityCREDChecker<\Espo\Entities\Webhook>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;

application/Espo/Classes/Acl/Webhook/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,13 +30,13 @@
 namespace Espo\Classes\Acl\Webhook;
 
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Webhook>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

application/Espo/Classes/AclPortal/Attachment/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -32,6 +32,7 @@ namespace Espo\Classes\AclPortal\Attachment;
 use Espo\Entities\{
     User,
     Note,
+    Attachment,
 };
 
 use Espo\ORM\Entity;
@@ -45,6 +46,9 @@ use Espo\Core\{
     Portal\Acl\Traits\DefaultAccessCheckerDependency,
 };
 
+/**
+ * @implements AccessEntityCREDChecker<Attachment>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
@@ -67,25 +71,29 @@ class AccessChecker implements AccessEntityCREDChecker
 
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
     {
+        /** @var Attachment $entity */
+
         if ($entity->get('parentType') === 'Settings') {
+            // Allow the logo.
             return true;
         }
 
         $parent = null;
-        $hasParent = false;
 
-        if ($entity->get('parentId') && $entity->get('parentType')) {
-            $hasParent = true;
+        $parentType = $entity->get('parentType');
+        $parentId = $entity->get('parentId');
 
-            $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        $relatedType = $entity->get('relatedType');
+        $relatedId = $entity->get('relatedId');
+
+        if ($parentId && $parentType) {
+            $parent = $this->entityManager->getEntityById($parentType, $parentId);
         }
-        else if ($entity->get('relatedId') && $entity->get('relatedType')) {
-            $hasParent = true;
-
-            $parent = $this->entityManager->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
+        else if ($relatedId && $relatedType) {
+            $parent = $this->entityManager->getEntityById($relatedType, $relatedId);
         }
 
-        if (!$hasParent) {
+        if (!$parent) {
             if ($entity->get('createdById') === $user->getId()) {
                 return true;
             }
@@ -94,6 +102,7 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if ($parent->getEntityType() === 'Note') {
+            /** @var Note $parent */
             $result = $this->checkEntityReadNoteParent($user, $parent);
 
             if ($result !== null) {
@@ -101,6 +110,16 @@ class AccessChecker implements AccessEntityCREDChecker
             }
         }
         else if ($this->aclManager->checkEntity($user, $parent)) {
+            if (
+                $entity->getTargetField() &&
+                in_array(
+                    $entity->getTargetField(),
+                    $this->aclManager->getScopeForbiddenFieldList($user, $parent->getEntityType())
+                )
+            ) {
+                return false;
+            }
+
             return true;
         }
 
@@ -119,8 +138,8 @@ class AccessChecker implements AccessEntityCREDChecker
 
         if ($note->getTargetType() === Note::TARGET_PORTALS) {
             $intersect = array_intersect(
-                $note->getLinkMultipleIdList('portals'),
-                $user->getLinkMultipleIdList('portals')
+                $note->getLinkMultipleIdList('portals') ?? [],
+                $user->getLinkMultipleIdList('portals') ?? []
             );
 
             if (count($intersect)) {

application/Espo/Classes/AclPortal/Attachment/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,6 +37,9 @@ use Espo\Core\{
     Acl\OwnershipOwnChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Attachment>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     private const ATTR_CREATED_BY_ID = 'createdById';

application/Espo/Classes/AclPortal/Email/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -33,8 +33,9 @@ use Espo\Entities\User;
 
 use Espo\ORM\Entity;
 
+use Espo\Core\ORM\Entity as CoreEntity;
+
 use Espo\Core\{
-    Portal\AclManager,
     Acl\Table,
     Acl\ScopeData,
     Acl\AccessEntityCREDSChecker,
@@ -42,20 +43,19 @@ use Espo\Core\{
     Portal\Acl\Traits\DefaultAccessCheckerDependency,
 };
 
+/**
+ * @implements AccessEntityCREDSChecker<\Espo\Entities\Email>
+ */
 class AccessChecker implements AccessEntityCREDSChecker
 {
     use DefaultAccessCheckerDependency;
 
     private $defaultAccessChecker;
 
-    private $aclManager;
-
     public function __construct(
-        DefaultAccessChecker $defaultAccessChecker,
-        AclManager $aclManager
+        DefaultAccessChecker $defaultAccessChecker
     ) {
         $this->defaultAccessChecker = $defaultAccessChecker;
-        $this->aclManager = $aclManager;
     }
 
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
@@ -72,6 +72,8 @@ class AccessChecker implements AccessEntityCREDSChecker
             return false;
         }
 
+        assert($entity instanceof CoreEntity);
+
         $userIdList = $entity->getLinkMultipleIdLIst('users');
 
         if (is_array($userIdList) && in_array($user->getId(), $userIdList)) {

application/Espo/Classes/AclPortal/Email/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,6 +37,9 @@ use Espo\Core\{
     Acl\OwnershipOwnChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Email>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

application/Espo/Classes/AclPortal/Note/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -46,6 +46,9 @@ use Espo\Core\{
 use DateTime;
 use Exception;
 
+/**
+ * @implements AccessEntityCREDChecker<\Espo\Entities\Note>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;

application/Espo/Classes/AclPortal/Note/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,6 +37,9 @@ use Espo\Core\{
     Acl\OwnershipOwnChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Note>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

application/Espo/Classes/AclPortal/Notification/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,6 +37,9 @@ use Espo\Core\{
     Acl\OwnershipOwnChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Notification>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

application/Espo/Classes/AclPortal/User/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,6 +37,9 @@ use Espo\Core\{
     Acl\OwnershipOwnChecker,
 };
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\User>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

application/Espo/Classes/AddressFormatters/Formatter1.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/AddressFormatters/Formatter2.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/AddressFormatters/Formatter3.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/AddressFormatters/Formatter4.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/AppInfo/Binding.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -69,7 +69,7 @@ class Binding
             $keyList = $data->getContextKeyList($context);
 
             foreach ($keyList as $key) {
-                $result .= $this->printItem($key, $data->getContext($context, $key), true);
+                $result .= $this->printItem($key, $data->getContext($context, $key));
             }
         }
 

application/Espo/Classes/AppInfo/Container.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -63,10 +63,11 @@ class Container
             'user',
         ];
 
+        /** @var string[] */
         $fileList = scandir('application/Espo/Core/Loaders');
 
         if (file_exists('custom/Espo/Custom/Core/Loaders')) {
-            $fileList = array_merge($fileList, scandir('custom/Espo/Custom/Core/Loaders'));
+            $fileList = array_merge($fileList, scandir('custom/Espo/Custom/Core/Loaders') ?: []);
         }
 
         foreach ($fileList as $file) {

application/Espo/Classes/AppInfo/Jobs.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/AppParams/TemplateEntityTypeList.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -40,9 +40,11 @@ use Espo\Core\{
  */
 class TemplateEntityTypeList
 {
-    protected $acl;
-    protected $selectBuilderFactory;
-    protected $entityManager;
+    private $acl;
+
+    private $selectBuilderFactory;
+
+    private $entityManager;
 
     public function __construct(Acl $acl, SelectBuilderFactory $selectBuilderFactory, EntityManager $entityManager)
     {
@@ -51,7 +53,10 @@ class TemplateEntityTypeList
         $this->entityManager = $entityManager;
     }
 
-    public function get() : array
+    /**
+     * @return string[]
+     */
+    public function get(): array
     {
         if (!$this->acl->checkScope('Template')) {
             return [];
@@ -69,7 +74,7 @@ class TemplateEntityTypeList
             ->build();
 
         $templateCollection = $this->entityManager
-            ->getRepository('Template')
+            ->getRDBRepository('Template')
             ->clone($query)
             ->find();
 

application/Espo/Classes/AssignmentNotificators/Email.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -35,7 +35,7 @@ use Espo\Services\Stream as StreamService;
 use Espo\Core\Notification\AssignmentNotificator;
 use Espo\Core\Notification\AssignmentNotificator\Params;
 use Espo\Core\Notification\UserEnabledChecker;
-use Espo\Core\ServiceFactory;
+use Espo\Core\InjectableFactory;
 use Espo\Core\AclManager;
 
 use Espo\ORM\EntityManager;
@@ -43,6 +43,10 @@ use Espo\ORM\Entity;
 
 use Espo\Entities\User;
 use Espo\Entities\Notification;
+use Espo\Entities\Email as EmailEntity;
+
+use Espo\Repositories\Email as EmailRepository;
+use Espo\Repositories\EmailAddress as EmailAddressRepository;
 
 use DateTime;
 use Exception;
@@ -51,13 +55,13 @@ class Email implements AssignmentNotificator
 {
     private const DAYS_THRESHOLD = 2;
 
-    private $streamService = null;
+    private ?StreamService $streamService = null;
 
     private $user;
 
     private $entityManager;
 
-    private $serviceFactory;
+    private $injectableFactory;
 
     private $aclManager;
 
@@ -67,19 +71,30 @@ class Email implements AssignmentNotificator
         User $user,
         EntityManager $entityManager,
         UserEnabledChecker $userChecker,
-        ServiceFactory $serviceFactory,
+        InjectableFactory $injectableFactory,
         AclManager $aclManager
     ) {
         $this->user = $user;
         $this->entityManager = $entityManager;
         $this->userChecker = $userChecker;
-        $this->serviceFactory = $serviceFactory;
+        $this->injectableFactory = $injectableFactory;
         $this->aclManager = $aclManager;
     }
 
     public function process(Entity $entity, Params $params): void
     {
-        if (!in_array($entity->get('status'), ['Archived', 'Sent', 'Being Imported'])) {
+        /** @var EmailEntity $entity */
+
+        if (
+            !in_array(
+                $entity->get('status'),
+                [
+                    EmailEntity::STATUS_ARCHIVED,
+                    EmailEntity::STATUS_SENT,
+                    EmailEntity::STATUS_BEING_IMPORTED,
+                ]
+            )
+        ) {
             return;
         }
 
@@ -107,10 +122,6 @@ class Email implements AssignmentNotificator
             return;
         }
 
-        if (!$dt) {
-            return;
-        }
-
         if ($dt->diff(new DateTime())->days > self::DAYS_THRESHOLD) {
             return;
         }
@@ -138,12 +149,17 @@ class Email implements AssignmentNotificator
             'emailName' => $entity->get('name'),
         ];
 
+        /** @var EmailRepository $emailRepository */
+        $emailRepository = $this->entityManager->getRepository('Email');
+        /** @var EmailAddressRepository $emailAddressRepository */
+        $emailAddressRepository = $this->entityManager->getRepository('EmailAddress');
+
         if (!$entity->has('from')) {
-            $this->entityManager->getRepository('Email')->loadFromField($entity);
+            $emailRepository->loadFromField($entity);
         }
 
         if (!$entity->has('to')) {
-            $this->entityManager->getRepository('Email')->loadToField($entity);
+            $emailRepository->loadToField($entity);
         }
 
         $person = null;
@@ -151,9 +167,7 @@ class Email implements AssignmentNotificator
         $from = $entity->get('from');
 
         if ($from) {
-            $person = $this->entityManager
-                ->getRepository('EmailAddress')
-                ->getEntityByAddress($from, null, ['User', 'Contact', 'Lead']);
+            $person = $emailAddressRepository->getEntityByAddress($from, null, ['User', 'Contact', 'Lead']);
 
             if ($person) {
                 $data['personEntityType'] = $person->getEntityType();
@@ -165,7 +179,7 @@ class Email implements AssignmentNotificator
         $userIdFrom = null;
 
         if ($person && $person->getEntityType() === 'User') {
-            $userIdFrom = $person->id;
+            $userIdFrom = $person->getId();
         }
 
         if (empty($data['personEntityId'])) {
@@ -178,14 +192,19 @@ class Email implements AssignmentNotificator
 
         $parent = null;
 
-        if ($entity->get('parentId') && $entity->get('parentType')) {
-            $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        $parentId = $entity->get('parentId');
+        $parentType = $entity->get('parentType');
+
+        if ($parentType && $parentId) {
+            $parent = $this->entityManager->getEntityById($parentType, $parentId);
         }
 
         $account = null;
 
-        if ($entity->get('accountId')) {
-            $account = $this->entityManager->getEntity('Account', $entity->get('accountId'));
+        $accountId = $entity->get('accountId');
+
+        if ($accountId) {
+            $account = $this->entityManager->getEntityById('Account', $accountId);
         }
 
         foreach ($userIdList as $userId) {
@@ -214,7 +233,7 @@ class Email implements AssignmentNotificator
                 if ($folderId) {
                     if (
                         $this->entityManager
-                            ->getRepository('EmailFolder')
+                            ->getRDBRepository('EmailFolder')
                             ->where([
                                 'id' => $folderId,
                                 'skipNotifications' => true,
@@ -226,6 +245,7 @@ class Email implements AssignmentNotificator
                 }
             }
 
+            /** @var User|null $user */
             $user = $this->entityManager->getEntity('User', $userId);
 
             if (!$user) {
@@ -241,7 +261,7 @@ class Email implements AssignmentNotificator
             }
 
             $isArchivedOrBeingImported =
-                $entity->get('status') === 'Archived' ||
+                $entity->get('status') === EmailEntity::STATUS_ARCHIVED ||
                 $params->getOption('isBeingImported');
 
             if (
@@ -261,7 +281,7 @@ class Email implements AssignmentNotificator
             }
 
             $existing = $this->entityManager
-                ->getRepository(Notification::ENTITY_TYPE)
+                ->getRDBRepository(Notification::ENTITY_TYPE)
                 ->where([
                     'type' => Notification::TYPE_EMAIL_RECEIVED,
                     'userId' => $userId,
@@ -288,7 +308,7 @@ class Email implements AssignmentNotificator
     private function getStreamService(): StreamService
     {
         if (empty($this->streamService)) {
-            $this->streamService = $this->serviceFactory->create('Stream');
+            $this->streamService = $this->injectableFactory->create(StreamService::class);
         }
 
         return $this->streamService;

application/Espo/Classes/Cleanup/Exports.php

@@ -0,0 +1,73 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii 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\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Utils\Config;
+use Espo\ORM\EntityManager;
+
+use Espo\Core\Field\DateTime;
+
+use Espo\Entities\Export;
+
+class Exports implements Cleanup
+{
+    private $config;
+
+    private $entityManager;
+
+    private string $cleanupPeriod = '2 days';
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(): void
+    {
+        $period = '-' . $this->config->get('cleanupExportsPeriod', $this->cleanupPeriod);
+
+        $before = DateTime::createNow()
+            ->modify($period)
+            ->getString();
+
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from(Export::ENTITY_TYPE)
+            ->where([
+                'createdAt<' => $before,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+}

application/Espo/Classes/Cleanup/MassActions.php

@@ -0,0 +1,71 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii 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\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Utils\Config;
+use Espo\ORM\EntityManager;
+
+use Espo\Core\Field\DateTime;
+
+class MassActions implements Cleanup
+{
+    private $config;
+
+    private $entityManager;
+
+    private string $cleanupPeriod = '14 days';
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(): void
+    {
+        $period = '-' . $this->config->get('cleanupMassActionsPeriod', $this->cleanupPeriod);
+
+        $before = DateTime::createNow()
+            ->modify($period)
+            ->getString();
+
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from('MassAction')
+            ->where([
+                'createdAt<' => $before,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+}

application/Espo/Classes/Cleanup/PasswordChangeRequests.php

@@ -0,0 +1,73 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii 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\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Utils\Config;
+use Espo\Core\Field\DateTime;
+
+use Espo\ORM\EntityManager;
+
+use Espo\Entities\PasswordChangeRequest;
+
+class PasswordChangeRequests implements Cleanup
+{
+    private Config $config;
+
+    private EntityManager $entityManager;
+
+    private string $cleanupPeriod = '30 days';
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(): void
+    {
+        $period = '-' . $this->config->get('cleanupPasswordChangeRequestsPeriod', $this->cleanupPeriod);
+
+        $before = DateTime::createNow()
+            ->modify($period)
+            ->getString();
+
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from(PasswordChangeRequest::ENTITY_TYPE)
+            ->where([
+                'createdAt<' => $before,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+}

application/Espo/Classes/Cleanup/Reminders.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -41,7 +41,7 @@ class Reminders implements Cleanup
 
     private $entityManager;
 
-    private $cleanupRemindersPeriod = '15 days';
+    private string $cleanupRemindersPeriod = '15 days';
 
     public function __construct(Config $config, EntityManager $entityManager)
     {

application/Espo/Classes/Cleanup/TwoFactorCodes.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/Cleanup/WebhookQueue.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@ use DateTime;
 
 class WebhookQueue implements Cleanup
 {
-    private $cleanupWebhookQueuePeriod = '10 days';
+    private string $cleanupWebhookQueuePeriod = '10 days';
 
     private $config;
 

application/Espo/Classes/ConsoleCommands/Import.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -31,6 +31,8 @@ namespace Espo\Classes\ConsoleCommands;
 
 use Espo\Tools\Import\Service;
 
+use Espo\Core\Utils\File\Manager as FileManager;
+
 use Espo\Core\{
     Console\Command,
     Console\Command\Params,
@@ -41,11 +43,14 @@ use Throwable;
 
 class Import implements Command
 {
-    private $service;
+    private Service $service;
 
-    public function __construct(Service $service)
+    private FileManager $fileManager;
+
+    public function __construct(Service $service, FileManager $fileManager)
     {
         $this->service = $service;
+        $this->fileManager = $fileManager;
     }
 
     public function run(Params $params, IO $io) : void
@@ -64,13 +69,13 @@ class Import implements Command
                 return;
             }
 
-            if (!file_exists($filePath)) {
+            if (!$this->fileManager->isFile($filePath)) {
                 $io->writeLine("File not found.");
 
                 return;
             }
 
-            $contents = file_get_contents($filePath);
+            $contents = $this->fileManager->getContents($filePath);
 
             try {
                 $result = $this->service->importContentsWithParamsId($contents, $paramsId);

application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -33,32 +33,32 @@ use Espo\Core\Utils\Metadata;
 
 class DefaultSidePanelType
 {
-    protected $metadata;
+    private $metadata;
 
     public function __construct(Metadata $metadata)
     {
         $this->metadata = $metadata;
     }
 
+    /**
+     * @return \stdClass[]
+     */
     public function get(string $scope): array
     {
         $list = [];
 
         if (
-            $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUser', 'type']) === 'link'
-            &&
+            $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUser', 'type']) === 'link' &&
             $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUser', 'entity']) === 'User'
             ||
-            $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUsers', 'type']) === 'linkMultiple'
-            &&
+            $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUsers', 'type']) === 'linkMultiple' &&
             $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUsers', 'entity']) === 'User'
         ) {
             $list[] = (object) ['name' => ':assignedUser'];
         }
 
         if (
-            $this->metadata->get(['entityDefs', $scope, 'fields', 'teams', 'type']) === 'linkMultiple'
-            &&
+            $this->metadata->get(['entityDefs', $scope, 'fields', 'teams', 'type']) === 'linkMultiple' &&
             $this->metadata->get(['entityDefs', $scope, 'links', 'teams', 'entity']) === 'Team'
         ) {
             $list[] = (object) ['name' => 'teams'];

application/Espo/Classes/DuplicateWhereBuilders/Company.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,6 +30,8 @@
 namespace Espo\Classes\DuplicateWhereBuilders;
 
 use Espo\Core\Duplicate\WhereBuilder;
+use Espo\Core\Field\EmailAddressGroup;
+use Espo\Core\ORM\Entity as CoreEntity;
 
 use Espo\ORM\{
     Query\Part\Condition as Cond,
@@ -38,10 +40,15 @@ use Espo\ORM\{
     Entity,
 };
 
+/**
+ * @implements WhereBuilder<CoreEntity>
+ */
 class Company implements WhereBuilder
 {
     public function build(Entity $entity): ?WhereItem
     {
+        assert($entity instanceof CoreEntity);
+
         $orBuilder = OrGroup::createBuilder();
 
         $toCheck = false;
@@ -84,10 +91,13 @@ class Company implements WhereBuilder
         return $orBuilder->build();
     }
 
-    private function getEmailAddressList(Entity $entity): array
+    /**
+     * @return string[]
+     */
+    private function getEmailAddressList(CoreEntity $entity): array
     {
         if ($entity->get('emailAddressData')) {
-            /* @var $eaGroup EmailAddressGroup */
+            /** @var EmailAddressGroup $eaGroup */
             $eaGroup = $entity->getValueObject('emailAddress');
 
             return $eaGroup->getAddressList();

application/Espo/Classes/DuplicateWhereBuilders/Person.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,6 +29,8 @@
 
 namespace Espo\Classes\DuplicateWhereBuilders;
 
+use Espo\Core\ORM\Entity as CoreEntity;
+
 use Espo\Core\{
     Duplicate\WhereBuilder,
     Field\EmailAddressGroup,
@@ -41,10 +43,15 @@ use Espo\ORM\{
     Entity,
 };
 
+/**
+ * @implements WhereBuilder<CoreEntity>
+ */
 class Person implements WhereBuilder
 {
     public function build(Entity $entity): ?WhereItem
     {
+        assert($entity instanceof CoreEntity);
+
         $orBuilder = OrGroup::createBuilder();
 
         $toCheck = false;
@@ -93,10 +100,13 @@ class Person implements WhereBuilder
         return $orBuilder->build();
     }
 
-    private function getEmailAddressList(Entity $entity): array
+    /**
+     * @return string[]
+     */
+    private function getEmailAddressList(CoreEntity $entity): array
     {
         if ($entity->get('emailAddressData')) {
-            /* @var $eaGroup EmailAddressGroup */
+            /** @var EmailAddressGroup $eaGroup */
             $eaGroup = $entity->getValueObject('emailAddress');
 
             return $eaGroup->getAddressList();

application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php

@@ -0,0 +1,90 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii 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\FieldDuplicators;
+
+use Espo\Core\Record\Duplicator\FieldDuplicator;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+
+use Espo\Repositories\Attachment as AttachmentRepository;
+use Espo\Entities\Attachment;
+
+use stdClass;
+
+class AttachmentMultiple implements FieldDuplicator
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function duplicate(Entity $entity, string $field): stdClass
+    {
+        $valueMap = (object) [];
+
+        /** @var \Espo\ORM\Collection<Attachment> $attachmentList */
+        $attachmentList = $this->entityManager
+            ->getRDBRepository($entity->getEntityType())
+            ->getRelation($entity, $field)
+            ->find();
+
+        if (is_countable($attachmentList) && !count($attachmentList)) {
+            return $valueMap;
+        }
+
+        $idList = [];
+        $nameHash = (object) [];
+        $typeHash = (object) [];
+
+        /** @var AttachmentRepository $attachmentRepository */
+        $attachmentRepository = $this->entityManager->getRepository(Attachment::ENTITY_TYPE);
+
+        foreach ($attachmentList as $attachment) {
+            $copiedAttachment = $attachmentRepository->getCopiedAttachment($attachment);
+
+            $copiedAttachment->set('field', $field);
+
+            $this->entityManager->saveEntity($copiedAttachment);
+
+            $idList[] = $copiedAttachment->getId();
+
+            $nameHash->{$copiedAttachment->getId()} = $copiedAttachment->getName();
+            $typeHash->{$copiedAttachment->getId()} = $copiedAttachment->getType();
+        }
+
+        $valueMap->{$field . 'Ids'} = $idList;
+        $valueMap->{$field . 'Names'} = $nameHash;
+        $valueMap->{$field . 'Types'} = $typeHash;
+
+        return $valueMap;
+    }
+}

application/Espo/Classes/FieldDuplicators/File.php

@@ -0,0 +1,75 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii 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\FieldDuplicators;
+
+use Espo\Core\Record\Duplicator\FieldDuplicator;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+
+use Espo\Repositories\Attachment as AttachmentRepository;
+use Espo\Entities\Attachment;
+
+use stdClass;
+
+class File implements FieldDuplicator
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function duplicate(Entity $entity, string $field): stdClass
+    {
+        $valueMap = (object) [];
+
+        /** @var Attachment|null $attachment */
+        $attachment = $this->entityManager
+            ->getRDBRepository($entity->getEntityType())
+            ->getRelation($entity, $field)
+            ->findOne();
+
+        if (!$attachment) {
+            return $valueMap;
+        }
+
+        /** @var AttachmentRepository $attachmentRepository */
+        $attachmentRepository = $this->entityManager->getRepository(Attachment::ENTITY_TYPE);
+
+        $copiedAttachment = $attachmentRepository->getCopiedAttachment($attachment);
+
+        $idAttribute = $field . 'Id';
+
+        $valueMap->$idAttribute = $copiedAttachment->getId();
+
+        return $valueMap;
+    }
+}

application/Espo/Classes/FieldDuplicators/LinkMultiple.php

@@ -0,0 +1,82 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii 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\FieldDuplicators;
+
+use Espo\Core\Record\Duplicator\FieldDuplicator;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+
+use stdClass;
+
+class LinkMultiple implements FieldDuplicator
+{
+    private EntityManager $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function duplicate(Entity $entity, string $field): stdClass
+    {
+        $valueMap = (object) [];
+
+        $entityDefs = $this->entityManager
+            ->getDefs()
+            ->getEntity($entity->getEntityType());
+
+        if (!$entity->hasRelation($field)) {
+            return $valueMap;
+        }
+
+        $relationDefs = $entityDefs->getRelation($field);
+
+        if (
+            !$relationDefs->hasForeignEntityType() ||
+            !$relationDefs->hasForeignRelationName()
+        ) {
+            return $valueMap;
+        }
+
+        $foreignRelationType = $this->entityManager
+            ->getDefs()
+            ->getEntity($relationDefs->getForeignEntityType())
+            ->getRelation($relationDefs->getForeignRelationName())
+            ->getType();
+
+        if ($foreignRelationType !== Entity::HAS_MANY) {
+            $valueMap->{$field . 'Ids'} = [];
+            $valueMap->{$field . 'Names'} = (object) [];
+            $valueMap->{$field . 'Columns'} = (object) [];
+        }
+
+        return $valueMap;
+    }
+}

application/Espo/Classes/FieldDuplicators/Wysiwyg.php

@@ -0,0 +1,117 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii 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\FieldDuplicators;
+
+use Espo\Core\Record\Duplicator\FieldDuplicator;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+
+use Espo\Repositories\Attachment as AttachmentRepository;
+use Espo\Entities\Attachment;
+
+use stdClass;
+
+class Wysiwyg implements FieldDuplicator
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function duplicate(Entity $entity, string $field): stdClass
+    {
+        $valueMap = (object) [];
+
+        $contents = $entity->get($field);
+
+        if (!$contents) {
+            return $valueMap;
+        }
+
+        $matches = [];
+
+        $matchResult = preg_match_all("/\?entryPoint=attachment&amp;id=([^&=\"']+)/", $contents, $matches);
+
+        if (
+            !$matchResult ||
+            empty($matches[1]) ||
+            !is_array($matches[1])
+        ) {
+            return $valueMap;
+        }
+
+        $attachmentIdList = $matches[1];
+
+        /** @var Attachment[] $attachmentList */
+        $attachmentList = [];
+
+        foreach ($attachmentIdList as $id) {
+            /** @var Attachment|null $attachment */
+            $attachment = $this->entityManager->getEntity(Attachment::ENTITY_TYPE, $id);
+
+            if (!$attachment) {
+                continue;
+            }
+
+            $attachmentList[] = $attachment;
+        }
+
+        if (!count($attachmentList)) {
+            return $valueMap;
+        }
+
+        /** @var AttachmentRepository $attachmentRepository */
+        $attachmentRepository = $this->entityManager->getRepository(Attachment::ENTITY_TYPE);
+
+        foreach ($attachmentList as $attachment) {
+            $copiedAttachment = $attachmentRepository->getCopiedAttachment($attachment);
+
+            $copiedAttachment->set([
+                'relatedId' => null,
+                'relatedType' => $entity->getEntityType(),
+                'field' => $field,
+            ]);
+
+            $this->entityManager->saveEntity($copiedAttachment);
+
+            $contents = str_replace(
+                '?entryPoint=attachment&amp;id=' . $attachment->getId(),
+                '?entryPoint=attachment&amp;id=' . $copiedAttachment->getId(),
+                $contents
+            );
+        }
+
+        $valueMap->$field = $contents;
+
+        return $valueMap;
+    }
+}

application/Espo/Classes/FieldProcessing/Email/AddressDataLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -39,6 +39,9 @@ use Espo\Core\{
 
 use Espo\Repositories\Email as EmailRepository;
 
+/**
+ * @implements Loader<\Espo\Entities\Email>
+ */
 class AddressDataLoader implements Loader
 {
     private $entityManager;
@@ -50,7 +53,7 @@ class AddressDataLoader implements Loader
 
     public function process(Entity $entity, Params $params): void
     {
-        /* @var $repository EmailRepository */
+        /** @var EmailRepository $repository */
         $repository = $this->entityManager->getRepository('Email');
 
         $repository->loadFromField($entity);

application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -47,13 +47,20 @@ use ICal\ICal;
 use ICal\Event;
 
 use Throwable;
+use stdClass;
 
+/**
+ * @implements Loader<\Espo\Entities\Email>
+ */
 class IcsDataLoader implements Loader
 {
     private $entityManager;
 
     private $log;
 
+    /**
+     * @var array<string,string>
+     */
     private $entityTypeLinkMap = [
         'User' => 'users',
         'Contact' => 'contacts',
@@ -114,7 +121,7 @@ class IcsDataLoader implements Loader
             return;
         }
 
-        /* @var $emailAddressRepository EmailAddressRepository */
+        /** @var EmailAddressRepository $emailAddressRepository */
         $emailAddressRepository = $this->entityManager->getRepository(EmailAddress::ENTITY_TYPE);
 
         $attendeeEmailAddressList = $espoEvent->getAttendeeEmailAddressList();
@@ -168,7 +175,7 @@ class IcsDataLoader implements Loader
         }
     }
 
-    private function loadCreatedEvent(Entity $entity, EspoEvent $espoEvent, object $eventData): void
+    private function loadCreatedEvent(Entity $entity, EspoEvent $espoEvent, stdClass $eventData): void
     {
         $emailSameEvent = $this->entityManager
             ->getRDBRepository(Email::ENTITY_TYPE)

application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -31,6 +31,8 @@ namespace Espo\Classes\FieldProcessing\Email;
 
 use Espo\ORM\Entity;
 
+use Espo\Repositories\EmailAddress as EmailAddressRepository;
+
 use Espo\Core\{
     FieldProcessing\Loader,
     FieldProcessing\Loader\Params,
@@ -40,12 +42,18 @@ use Espo\Core\{
 use Espo\Entities\Email;
 use Espo\Entities\User;
 
+/**
+ * @implements Loader<\Espo\Entities\Email>
+ */
 class StringDataLoader implements Loader
 {
     private $entityManager;
 
     private $user;
 
+    /**
+     * @var array<string,string>
+     */
     private $fromEmailAddressNameCache = [];
 
     public function __construct(EntityManager $entityManager, User $user)
@@ -56,6 +64,8 @@ class StringDataLoader implements Loader
 
     public function process(Entity $entity, Params $params): void
     {
+        /** @var Email $entity */
+
         $userEmailAdddressIdList = [];
 
         $emailAddressCollection = $this->entityManager
@@ -84,9 +94,7 @@ class StringDataLoader implements Loader
             $list = [];
 
             foreach ($idList as $emailAddressId) {
-                $person = $this->entityManager
-                    ->getRepository('EmailAddress')
-                    ->getEntityByAddressId($emailAddressId, null, true);
+                $person = $this->getEmailAddressRepository()->getEntityByAddressId($emailAddressId, null, true);
 
                 $list[] = $person ? $person->get('name') : $names->$emailAddressId;
             }
@@ -96,6 +104,7 @@ class StringDataLoader implements Loader
             return;
         }
 
+        /**  @var ?string */
         $fromEmailAddressId = $entity->get('fromEmailAddressId');
 
         if (!$fromEmailAddressId) {
@@ -103,9 +112,7 @@ class StringDataLoader implements Loader
         }
 
         if (!array_key_exists($fromEmailAddressId, $this->fromEmailAddressNameCache)) {
-            $person = $this->entityManager
-                ->getRepository('EmailAddress')
-                ->getEntityByAddressId($fromEmailAddressId, null, true);
+            $person = $this->getEmailAddressRepository()->getEntityByAddressId($fromEmailAddressId, null, true);
 
             $fromName = $person ? $person->get('name') : null;
 
@@ -119,4 +126,10 @@ class StringDataLoader implements Loader
 
         $entity->set('personStringData', $fromName);
     }
+
+    private function getEmailAddressRepository(): EmailAddressRepository
+    {
+        /** @var EmailAddressRepository */
+        return $this->entityManager->getRepository('EmailAddress');
+    }
 }

application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -39,6 +39,9 @@ use Espo\Core\{
 
 use Espo\Entities\User;
 
+/**
+ * @implements Loader<\Espo\Entities\Email>
+ */
 class UserColumnsLoader implements Loader
 {
     private $entityManager;
@@ -54,7 +57,7 @@ class UserColumnsLoader implements Loader
     public function process(Entity $entity, Params $params): void
     {
         $emailUser = $this->entityManager
-            ->getRepository('EmailUser')
+            ->getRDBRepository('EmailUser')
             ->select(['isRead', 'isImportant', 'inTrash'])
             ->where([
                 'deleted' => false,

application/Espo/Classes/FieldProcessing/Import/CountsLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -39,6 +39,9 @@ use Espo\Core\{
 
 use Espo\Repositories\Import as ImportRepository;
 
+/**
+ * @implements Loader<\Espo\Entities\Import>
+ */
 class CountsLoader implements Loader
 {
     private $entityManager;
@@ -50,7 +53,7 @@ class CountsLoader implements Loader
 
     public function process(Entity $entity, Params $params): void
     {
-        /* @var $repository ImportRepository */
+        /** @var ImportRepository $repository */
         $repository = $this->entityManager->getRepository('Import');
 
         $importedCount = $repository->countResultRecords($entity, 'imported');

application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -38,11 +38,14 @@ use Espo\Core\{
 
 use Espo\Entities\Note;
 
+/**
+ * @implements Loader<\Espo\Entities\Note>
+ */
 class AttachmentsLoader implements Loader
 {
     public function process(Entity $entity, Params $params): void
     {
-        /* @var $entity Note */
+        /** @var Note $entity */
         $entity->loadAttachments();
     }
 }

application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -31,12 +31,18 @@ namespace Espo\Classes\FieldProcessing\Portal;
 
 use Espo\ORM\Entity;
 
+use Espo\Repositories\Portal as PortalRepository;
+use Espo\Entities\Portal;
+
 use Espo\Core\{
     FieldProcessing\Loader,
     FieldProcessing\Loader\Params,
     ORM\EntityManager,
 };
 
+/**
+ * @implements Loader<\Espo\Entities\Portal>
+ */
 class UrlLoader implements Loader
 {
     private $entityManager;
@@ -48,8 +54,14 @@ class UrlLoader implements Loader
 
     public function process(Entity $entity, Params $params): void
     {
-        $this->entityManager
-            ->getRepository('Portal')
-            ->loadUrlField($entity);
+        /** @var Portal $entity */
+
+        $this->getPortalRepository()->loadUrlField($entity);
+    }
+
+    private function getPortalRepository(): PortalRepository
+    {
+        /** @var PortalRepository */
+        return $this->entityManager->getRepository('Portal');
     }
 }

application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -42,6 +42,9 @@ use Espo\Core\{
 use DateTime;
 use Exception;
 
+/**
+ * @implements Loader<\Espo\Entities\User>
+ */
 class LastAccessLoader implements Loader
 {
     private $entityManager;

application/Espo/Classes/FieldValidators/ArrayIntType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/ArrayType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/ChecklistType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/CurrencyType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/DateType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/DatetimeOptionalType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/DatetimeType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/Email/EmailAddresses.php

@@ -0,0 +1,49 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii 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\FieldValidators\Email;
+
+use Espo\ORM\Entity;
+
+class EmailAddresses
+{
+    public function checkRequired(Entity $entity, string $field): bool
+    {
+        if ($entity->get('status') === 'Draft') {
+            return true;
+        }
+
+        return $this->isNotEmpty($entity, $field);
+    }
+
+    private function isNotEmpty(Entity $entity, string $field): bool
+    {
+        return $entity->has($field) && $entity->get($field) !== '' && $entity->get($field) !== null;
+    }
+}

application/Espo/Classes/FieldValidators/EmailType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/EnumType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/FileType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/FloatType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/ImageType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/IntType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -38,6 +38,9 @@ class IntType
         return $this->isNotEmpty($entity, $field);
     }
 
+    /**
+     * @param mixed $validationValue
+     */
     public function checkMax(Entity $entity, string $field, $validationValue): bool
     {
         if (!$this->isNotEmpty($entity, $field)) {
@@ -51,6 +54,9 @@ class IntType
         return true;
     }
 
+    /**
+     * @param mixed $validationValue
+     */
     public function checkMin(Entity $entity, string $field, $validationValue): bool
     {
         if (!$this->isNotEmpty($entity, $field)) {

application/Espo/Classes/FieldValidators/JsonArrayType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/LinkMultipleType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,11 +30,19 @@
 namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
+use Espo\Core\ORM\Entity as CoreEntity;
 
 class LinkMultipleType
 {
     public function checkRequired(Entity $entity, string $field): bool
     {
-        return count($entity->getLinkMultipleIdList($field)) > 0;
+        if (!$entity instanceof CoreEntity) {
+            return false;
+        }
+
+        /** @var string[] */
+        $idList = $entity->getLinkMultipleIdList($field);
+
+        return count($idList) > 0;
     }
 }

application/Espo/Classes/FieldValidators/LinkParentType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/LinkType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/MultiEnumType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/PersonNameType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/PhoneType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/VarcharType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/JobPreparators/CheckEmailAccounts.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -93,7 +93,7 @@ class CheckEmailAccounts implements Preparator
                 continue;
             }
 
-            $jobEntity = $this->entityManager->getEntity(JobEntity::ENTITY_TYPE);
+            $jobEntity = $this->entityManager->getNewEntity(JobEntity::ENTITY_TYPE);
 
             $jobEntity->set([
                 'name' => $data->getName(),

application/Espo/Classes/JobPreparators/CheckInboundEmails.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -91,7 +91,7 @@ class CheckInboundEmails implements Preparator
                 continue;
             }
 
-            $jobEntity = $this->entityManager->getEntity(JobEntity::ENTITY_TYPE);
+            $jobEntity = $this->entityManager->getNewEntity(JobEntity::ENTITY_TYPE);
 
             $jobEntity->set([
                 'name' => $data->getName(),

application/Espo/Classes/Jobs/AuthTokenControl.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -83,7 +83,7 @@ class AuthTokenControl implements JobDataLess
         }
 
         $tokenList = $this->entityManager
-            ->getRepository('AuthToken')
+            ->getRDBRepository('AuthToken')
             ->where($whereClause)
             ->limit(0, 500)
             ->find();

application/Espo/Classes/Jobs/CheckEmailAccounts.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -31,13 +31,9 @@ namespace Espo\Classes\Jobs;
 
 use Espo\Core\Exceptions\Error;
 
-use Espo\Services\EmailAccount as Service;
-
-use Espo\Core\{
-    Job\Job,
-    Job\Job\Data,
-    ORM\EntityManager,
-};
+use Espo\Core\Mail\Account\PersonalAccount\Service;
+use Espo\Core\Job\Job;
+use Espo\Core\Job\Job\Data;
 
 use Throwable;
 
@@ -45,12 +41,9 @@ class CheckEmailAccounts implements Job
 {
     private $service;
 
-    private $entityManager;
-
-    public function __construct(Service $service, EntityManager $entityManager)
+    public function __construct(Service $service)
     {
         $this->service = $service;
-        $this->entityManager = $entityManager;
     }
 
     public function run(Data $data): void
@@ -61,22 +54,12 @@ class CheckEmailAccounts implements Job
             throw new Error("No target.");
         }
 
-        $entity = $this->entityManager->getEntity('EmailAccount', $targetId);
-
-        if (!$entity) {
-            throw new Error("Job CheckEmailAccounts '{$targetId}': EmailAccount does not exist.", -1);
-        }
-
-        if ($entity->get('status') !== 'Active') {
-            throw new Error("Job CheckEmailAccounts '{$targetId}': EmailAccount is not active.", -1);
-        }
-
         try {
-            $this->service->fetchFromMailServer($entity);
+            $this->service->fetch($targetId);
         }
         catch (Throwable $e) {
             throw new Error(
-                'Job CheckEmailAccounts ' . $entity->getId() . ': [' . $e->getCode() . '] ' .$e->getMessage()
+                'Job CheckEmailAccounts ' . $targetId . ': [' . $e->getCode() . '] ' .$e->getMessage()
             );
         }
     }

application/Espo/Classes/Jobs/CheckInboundEmails.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,14 +30,9 @@
 namespace Espo\Classes\Jobs;
 
 use Espo\Core\Exceptions\Error;
-
-use Espo\Services\InboundEmail as Service;
-
-use Espo\Core\{
-    Job\Job,
-    Job\Job\Data,
-    ORM\EntityManager,
-};
+use Espo\Core\Mail\Account\GroupAccount\Service;
+use Espo\Core\Job\Job;
+use Espo\Core\Job\Job\Data;
 
 use Throwable;
 
@@ -45,12 +40,9 @@ class CheckInboundEmails implements Job
 {
     private $service;
 
-    private $entityManager;
-
-    public function __construct(Service $service, EntityManager $entityManager)
+    public function __construct(Service $service)
     {
         $this->service = $service;
-        $this->entityManager = $entityManager;
     }
 
     public function run(Data $data): void
@@ -61,22 +53,12 @@ class CheckInboundEmails implements Job
             throw new Error("No target.");
         }
 
-        $entity = $this->entityManager->getEntity('InboundEmail', $targetId);
-
-        if (!$entity) {
-            throw new Error("Job CheckInboundEmails '{$targetId}': InboundEmail does not exist.", -1);
-        }
-
-        if ($entity->get('status') !== 'Active') {
-            throw new Error("Job CheckInboundEmails '{$targetId}': InboundEmail is not active.", -1);
-        }
-
         try {
-            $this->service->fetchFromMailServer($entity);
+            $this->service->fetch($targetId);
         }
         catch (Throwable $e) {
             throw new Error(
-                'Job CheckInboundEmails ' . $entity->getId() . ': [' . $e->getCode() . '] ' .$e->getMessage()
+                'Job CheckInboundEmails ' . $targetId . ': [' . $e->getCode() . '] ' .$e->getMessage()
             );
         }
     }

application/Espo/Classes/Jobs/CheckNewExtensionVersion.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -40,7 +40,8 @@ class CheckNewExtensionVersion extends CheckNewVersion
             return;
         }
 
-        $job = $this->entityManager->getEntity('Job');
+        $job = $this->entityManager->getNewEntity('Job');
+
         $job->set([
             'name' => 'Check for new versions of installed extensions (job)',
             'serviceName' => 'AdminNotifications',

application/Espo/Classes/Jobs/CheckNewVersion.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -40,8 +40,14 @@ use DateTimeZone;
 
 class CheckNewVersion implements JobDataLess
 {
+    /**
+     * @var Config
+     */
     protected $config;
 
+    /**
+     * @var EntityManager
+     */
     protected $entityManager;
 
     public function __construct(Config $config, EntityManager $entityManager)
@@ -56,7 +62,7 @@ class CheckNewVersion implements JobDataLess
             return;
         }
 
-        $job = $this->entityManager->getEntity('Job');
+        $job = $this->entityManager->getNewEntity('Job');
 
         $job->set([
             'name' => 'Check for New Version (job)',
@@ -70,7 +76,7 @@ class CheckNewVersion implements JobDataLess
         return;
     }
 
-    protected function getRunTime()
+    protected function getRunTime(): string
     {
         $hour = rand(0, 4);
         $minute = rand(0, 59);
@@ -93,7 +99,7 @@ class CheckNewVersion implements JobDataLess
      * For backward compatibility.
      * @deprecated
      */
-    protected function getEntityManager()
+    protected function getEntityManager() /** @phpstan-ignore-line */
     {
         return $this->entityManager;
     }

application/Espo/Classes/Jobs/Cleanup.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,6 +30,8 @@
 namespace Espo\Classes\Jobs;
 
 use Espo\Core\Record\ServiceContainer;
+use Espo\ORM\Repository\RDBRepository;
+use Espo\Core\ORM\Entity as CoreEntity;
 
 use Espo\Core\{
     Utils\Config,
@@ -51,23 +53,23 @@ use Throwable;
 
 class Cleanup implements JobDataLess
 {
-    private $cleanupJobPeriod = '10 days';
+    private string $cleanupJobPeriod = '10 days';
 
-    private $cleanupActionHistoryPeriod = '15 days';
+    private string $cleanupActionHistoryPeriod = '15 days';
 
-    private $cleanupAuthTokenPeriod = '1 month';
+    private string $cleanupAuthTokenPeriod = '1 month';
 
-    private $cleanupAuthLogPeriod = '2 months';
+    private string $cleanupAuthLogPeriod = '2 months';
 
-    private $cleanupNotificationsPeriod = '2 months';
+    private string $cleanupNotificationsPeriod = '2 months';
 
-    private $cleanupAttachmentsPeriod = '15 days';
+    private string $cleanupAttachmentsPeriod = '15 days';
 
-    private $cleanupAttachmentsFromPeriod = '3 months';
+    private string $cleanupAttachmentsFromPeriod = '3 months';
 
-    private $cleanupBackupPeriod = '2 month';
+    private string $cleanupBackupPeriod = '2 month';
 
-    private $cleanupDeletedRecordsPeriod = '3 months';
+    private string $cleanupDeletedRecordsPeriod = '3 months';
 
     private $config;
 
@@ -132,9 +134,12 @@ class Cleanup implements JobDataLess
 
         foreach ($items as $name => $item) {
             try {
+                /** @var class-string<\Espo\Core\Cleanup\Cleanup> */
                 $className = $item['className'];
 
-                $injectableFactory->create($className)->process();
+                $obj = $injectableFactory->create($className);
+
+                $obj->process();
             }
             catch (Throwable $e) {
                 $this->log->error("Cleanup: {$name}: " . $e->getMessage());
@@ -183,14 +188,16 @@ class Cleanup implements JobDataLess
 
     private function cleanupScheduledJobLog(): void
     {
-        $scheduledJobList = $this->entityManager->getRepository('ScheduledJob')
+        $scheduledJobList = $this->entityManager
+            ->getRDBRepository('ScheduledJob')
             ->select(['id'])
             ->find();
 
         foreach ($scheduledJobList as $scheduledJob) {
             $scheduledJobId = $scheduledJob->get('id');
 
-            $ignoreLogRecordList = $this->entityManager->getRepository('ScheduledJobLogRecord')
+            $ignoreLogRecordList = $this->entityManager
+                ->getRDBRepository('ScheduledJobLogRecord')
                 ->select(['id'])
                 ->where([
                     'scheduledJobId' => $scheduledJobId,
@@ -199,11 +206,16 @@ class Cleanup implements JobDataLess
                 ->limit(0, 10)
                 ->find();
 
+            if (!is_countable($ignoreLogRecordList)) {
+                continue;
+            }
+
             if (!count($ignoreLogRecordList)) {
                 continue;
             }
 
             $ignoreIdList = [];
+
             foreach ($ignoreLogRecordList as $logRecord) {
                 $ignoreIdList[] = $logRecord->get('id');
             }
@@ -300,7 +312,7 @@ class Cleanup implements JobDataLess
         $datetime->modify($period);
 
         $collection = $this->entityManager
-            ->getRepository('Attachment')
+            ->getRDBRepository('Attachment')
             ->where([
                 'OR' => [
                     [
@@ -329,7 +341,7 @@ class Cleanup implements JobDataLess
             ]);
 
             $collection = $this->entityManager
-                ->getRepository('Attachment')
+                ->getRDBRepository('Attachment')
                 ->clone($orphanQueryBuilder->build())
                 ->limit(0, 5000)
                 ->find();
@@ -345,6 +357,7 @@ class Cleanup implements JobDataLess
 
         $datetimeFrom->modify($fromPeriod);
 
+        /** @var string[] */
         $scopeList = array_keys($this->metadata->get(['scopes']));
 
         foreach ($scopeList as $scope) {
@@ -398,7 +411,8 @@ class Cleanup implements JobDataLess
                 continue;
             }
 
-            $query = $this->entityManager->getQueryBuilder()
+            $query = $this->entityManager
+                ->getQueryBuilder()
                 ->select()
                 ->from($scope)
                 ->withDeleted()
@@ -415,16 +429,16 @@ class Cleanup implements JobDataLess
 
             foreach ($deletedEntityList as $deletedEntity) {
                 $attachmentToRemoveList = $this->entityManager
-                    ->getRepository('Attachment')
+                    ->getRDBRepository('Attachment')
                     ->where([
                         'OR' => [
                             [
                                 'relatedType' => $scope,
-                                'relatedId' => $deletedEntity->id,
+                                'relatedId' => $deletedEntity->getId(),
                             ],
                             [
                                 'parentType' => $scope,
-                                'parentId' => $deletedEntity->id,
+                                'parentId' => $deletedEntity->getId(),
                             ]
                         ]
                     ])
@@ -436,7 +450,9 @@ class Cleanup implements JobDataLess
             }
         }
 
-        $delete = $this->entityManager->getQueryBuilder()->delete()
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
             ->from('Attachment')
             ->where([
                 'deleted' => true,
@@ -451,14 +467,15 @@ class Cleanup implements JobDataLess
     {
         $dateBefore = date('Y-m-d H:i:s', time() - 3600 * 24 * 20);
 
-        $query = $this->entityManager->getQueryBuilder()
+        $query = $this->entityManager
+            ->getQueryBuilder()
             ->select()
             ->from('Email')
             ->withDeleted()
             ->build();
 
         $emailList = $this->entityManager
-            ->getRepository('Email')
+            ->getRDBRepository('Email')
             ->clone($query)
             ->select(['id'])
             ->where([
@@ -471,7 +488,7 @@ class Cleanup implements JobDataLess
             $id = $email->get('id');
 
             $attachments = $this->entityManager
-                ->getRepository('Attachment')
+                ->getRDBRepository('Attachment')
                 ->where([
                     'parentId' => $id,
                     'parentType' => 'Email'
@@ -482,7 +499,9 @@ class Cleanup implements JobDataLess
                 $this->entityManager->removeEntity($attachment);
             }
 
-            $delete = $this->entityManager->getQueryBuilder()->delete()
+            $delete = $this->entityManager
+                ->getQueryBuilder()
+                ->delete()
                 ->from('Email')
                 ->where([
                     'deleted' => true,
@@ -492,7 +511,9 @@ class Cleanup implements JobDataLess
 
             $this->entityManager->getQueryExecutor()->execute($delete);
 
-            $delete = $this->entityManager->getQueryBuilder()->delete()
+            $delete = $this->entityManager
+                ->getQueryBuilder()
+                ->delete()
                 ->from('EmailUser')
                 ->where([
                     'emailId' => $id,
@@ -510,14 +531,17 @@ class Cleanup implements JobDataLess
         $datetime = new DateTime();
         $datetime->modify($period);
 
-        $notificationList = $this->entityManager->getRepository('Notification')
+        $notificationList = $this->entityManager
+            ->getRDBRepository('Notification')
             ->where([
                 'DATE:createdAt<' => $datetime->format('Y-m-d'),
             ])
             ->find();
 
         foreach ($notificationList as $notification) {
-            $this->entityManager->getRepository('Notification')->deleteFromDb($notification->get('id'));
+            $this->entityManager
+                ->getRDBRepository('Notification')
+                ->deleteFromDb($notification->get('id'));
         }
     }
 
@@ -527,8 +551,10 @@ class Cleanup implements JobDataLess
 
         $datetime = new DateTime('-' . $this->cleanupBackupPeriod);
 
-        if (file_exists($path)) {
-            $fileManager = $this->fileManager;
+        $fileManager = $this->fileManager;
+
+        if ($fileManager->exists($path)) {
+            /** @var string[] */
             $fileList = $fileManager->getFileList($path, false, '', false);
 
             foreach ($fileList as $dirName) {
@@ -553,7 +579,15 @@ class Cleanup implements JobDataLess
 
         $repository = $this->entityManager->getRepository($scope);
 
-        $repository->deleteFromDb($entity->id);
+        if (!$repository instanceof RDBRepository) {
+            return;
+        }
+
+        if (!$entity instanceof CoreEntity) {
+            return;
+        }
+
+        $repository->deleteFromDb($entity->getId());
 
         $query = $this->entityManager->getQueryComposer();
 
@@ -576,7 +610,7 @@ class Cleanup implements JobDataLess
                 }
 
                 $where = [
-                    $midKey => $entity->id,
+                    $midKey => $entity->getId(),
                 ];
 
                 $conditions = $entity->getRelationParam($relation, 'conditions') ?? [];
@@ -585,17 +619,15 @@ class Cleanup implements JobDataLess
                     $where[$key] = $value;
                 }
 
-                if (empty($where)) {
-                    continue;
-                }
-
                 $relationEntityType = ucfirst($relationName);
 
                 if (!$this->entityManager->hasRepository($relationEntityType)) {
                     continue;
                 }
 
-                $delete = $this->entityManager->getQueryBuilder()->delete()
+                $delete = $this->entityManager
+                    ->getQueryBuilder()
+                    ->delete()
                     ->from($relationEntityType)
                     ->where($where)
                     ->build();
@@ -607,24 +639,25 @@ class Cleanup implements JobDataLess
             }
         }
 
-        $query = $this->entityManager->getQueryBuilder()
+        $query = $this->entityManager
+            ->getQueryBuilder()
             ->select()
             ->from('Note')
             ->withDeleted()
             ->build();
 
         $noteList = $this->entityManager
-            ->getRepository('Note')
+            ->getRDBRepository('Note')
             ->clone($query)
             ->where([
                 'OR' => [
                     [
                         'relatedType' => $scope,
-                        'relatedId' => $entity->id,
+                        'relatedId' => $entity->getId(),
                     ],
                     [
                         'parentType' => $scope,
-                        'parentId' => $entity->id,
+                        'parentId' => $entity->getId(),
                     ]
                 ]
             ])
@@ -640,29 +673,33 @@ class Cleanup implements JobDataLess
 
         if ($scope === 'Note') {
             $attachmentList = $this->entityManager
-                ->getRepository('Attachment')
+                ->getRDBRepository('Attachment')
                 ->where([
-                    'parentId' => $entity->id,
+                    'parentId' => $entity->getId(),
                     'parentType' => 'Note',
                 ])
                 ->find();
 
             foreach ($attachmentList as $attachment) {
                 $this->entityManager->removeEntity($attachment);
-                $this->entityManager->getRepository('Attachment')->deleteFromDb($attachment->id);
+                $this->entityManager
+                    ->getRDBRepository('Attachment')
+                    ->deleteFromDb($attachment->getId());
             }
         }
 
         $arrayValueList = $this->entityManager
-            ->getRepository('ArrayValue')
+            ->getRDBRepository('ArrayValue')
             ->where([
                 'entityType' => $entity->getEntityType(),
-                'entityId' => $entity->id,
+                'entityId' => $entity->getId(),
             ])
             ->find();
 
         foreach ($arrayValueList as $arrayValue) {
-            $this->entityManager->getRepository('ArrayValue')->deleteFromDb($arrayValue->id);
+            $this->entityManager
+                ->getRDBRepository('ArrayValue')
+                ->deleteFromDb($arrayValue->getId());
         }
     }
 
@@ -676,6 +713,7 @@ class Cleanup implements JobDataLess
 
         $datetime = new DateTime($period);
 
+        /** @var string[] */
         $scopeList = array_keys($this->metadata->get(['scopes']));
 
         foreach ($scopeList as $scope) {
@@ -693,24 +731,12 @@ class Cleanup implements JobDataLess
 
             $repository = $this->entityManager->getRepository($scope);
 
-            if (!$repository) {
+            if (!$repository instanceof RDBRepository) {
                 continue;
             }
 
-            if (!method_exists($repository, 'find')) continue;
-            if (!method_exists($repository, 'clone')) continue;
-            if (!method_exists($repository, 'where')) continue;
-            if (!method_exists($repository, 'select')) continue;
-            if (!method_exists($repository, 'deleteFromDb')) continue;
-
-            $hasCleanupMethod = false;
-
             $service = $this->recordServiceContainer->get($scope);
 
-            if (method_exists($service, 'cleanup')) {
-                $hasCleanupMethod = true;
-            }
-
             $whereClause = [
                 'deleted' => 1,
             ];
@@ -722,7 +748,8 @@ class Cleanup implements JobDataLess
                 $whereClause['createdAt<'] = $datetime->format('Y-m-d H:i:s');
             }
 
-            $query = $this->entityManager->getQueryBuilder()
+            $query = $this->entityManager
+                ->getQueryBuilder()
                 ->select()
                 ->from($scope)
                 ->withDeleted()
@@ -735,9 +762,9 @@ class Cleanup implements JobDataLess
                 ->find();
 
             foreach ($deletedEntityList as $entity) {
-                if ($hasCleanupMethod) {
+                if (method_exists($service, 'cleanup')) {
                     try {
-                        $service->cleanup($entity->id);
+                        $service->cleanup($entity->getId());
                     }
                     catch (Throwable $e) {
                         $this->log->error("Cleanup job: Cleanup scope {$scope}: " . $e->getMessage());

application/Espo/Classes/Jobs/Dummy.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/Jobs/ProcessWebhookQueue.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/Jobs/SendEmailNotifications.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/MassAction/User/MassDelete.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -48,15 +48,15 @@ use Espo\{
 
 class MassDelete implements MassAction
 {
-    protected $massDeleteOriginal;
+    private $massDeleteOriginal;
 
-    protected $queryBuilder;
+    private $queryBuilder;
 
-    protected $entityManager;
+    private $entityManager;
 
-    protected $acl;
+    private $acl;
 
-    protected $user;
+    private $user;
 
     public function __construct(
         MassDeleteOriginal $massDeleteOriginal,
@@ -87,14 +87,14 @@ class MassDelete implements MassAction
         $query = $this->queryBuilder->build($params);
 
         $collection = $this->entityManager
-            ->getRepository('User')
+            ->getRDBRepository('User')
             ->clone($query)
             ->sth()
             ->select(['id'])
             ->find();
 
         foreach ($collection as $entity) {
-            $this->checkEntity($entity, $data);
+            $this->checkEntity($entity);
         }
 
         return $this->massDeleteOriginal->process($params, $data);
@@ -102,11 +102,11 @@ class MassDelete implements MassAction
 
     protected function checkEntity(Entity $entity): void
     {
-        if ($entity->id === 'system') {
+        if ($entity->getId() === 'system') {
             throw new Forbidden("Can't delete 'system' user.");
         }
 
-        if ($entity->id === $this->user->id) {
+        if ($entity->getId() === $this->user->getId()) {
             throw new Forbidden("Can't delete own user.");
         }
     }

application/Espo/Classes/MassAction/User/MassUpdate.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -50,19 +50,19 @@ use Espo\{
 
 class MassUpdate implements MassAction
 {
-    protected $massUpdateOriginal;
+    private $massUpdateOriginal;
 
-    protected $queryBuilder;
+    private $queryBuilder;
 
-    protected $entityManager;
+    private $entityManager;
 
-    protected $acl;
+    private $acl;
 
-    protected $user;
+    private $user;
 
-    protected $fileManager;
+    private $fileManager;
 
-    protected $dataManager;
+    private $dataManager;
 
     public function __construct(
         MassUpdateOriginal $massUpdateOriginal,
@@ -108,7 +108,7 @@ class MassUpdate implements MassAction
         $query = $this->queryBuilder->build($params);
 
         $collection = $this->entityManager
-            ->getRepository('User')
+            ->getRDBRepository('User')
             ->clone($query)
             ->sth()
             ->select(['id'])
@@ -127,11 +127,11 @@ class MassUpdate implements MassAction
 
     protected function checkEntity(Entity $entity, Data $data): void
     {
-        if ($entity->id === 'system') {
+        if ($entity->getId() === 'system') {
             throw new Forbidden("Can't update 'system' user.");
         }
 
-        if ($entity->id === $this->user->id) {
+        if ($entity->getId() === $this->user->getId()) {
             if ($data->has('isActive')) {
                 throw new Forbidden("Can't change 'isActive' field for own user.");
             }

application/Espo/Classes/RecordHooks/Team/BeforeLinkUserCheck.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -36,6 +36,9 @@ use Espo\ORM\Entity;
 
 use Espo\Entities\User;
 
+/**
+ * @implements LinkHook<\Espo\Entities\Team>
+ */
 class BeforeLinkUserCheck implements LinkHook
 {
     public function process(Entity $entity, string $link, Entity $foreignEntity): void
@@ -44,6 +47,8 @@ class BeforeLinkUserCheck implements LinkHook
             return;
         }
 
+        assert($foreignEntity instanceof User);
+
         $this->processUserCheck($foreignEntity);
     }