7.5.4

Fix grammar in error messages

.github/CONTRIBUTING.md

@@ -1,17 +1,25 @@
 ## Pull Requests
 
-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.
+Before we can merge your pull request, you need to accept our CLA [here](https://github.com/espocrm/cla).
 
-See [Code Style Guidelines](https://github.com/espocrm/espocrm/wiki/Code-Style-Guidelines).
+It's desirable that one PR solves one specific problem. Do not include code style changes to PRs
+(unless the main purpose of the PR is a code style fix).
+
+If you would like to contribute something that is not a small fix, it's reasonable to create an issue first
+(a bug report or feature request).
 
 Branches:
 
-* *hotfix/** – 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.
+* *master* – the develop branch; new features should be pushed to here;
+* *fix* – the upcoming maintenance release; small fixes should be pushed to here.
 
 ## Issues
 
-When reporting a possible bug please provide detail steps so that we will be able to reproduce the issue. Please try not to use phrases like "very big bug", "huge issue", etc. No need to use exclamation marks as well.
+We'd appreciate if you prefer posting issues on weekdays rather than weekends.
 
-Note that we don't provide developer help or any kind of support on Github. Please use our [forum](https://forum.espocrm.com) for this.
+When reporting a possible bug, please provide detail steps so that we will be able
+to reproduce the issue. Please try not to use phrases like "very big bug",
+"huge issue", etc. No need to use exclamation marks as well.
+
+Note that we don't provide developer help or any kind of support on GitHub.
+For this, please use our [forum](https://forum.espocrm.com).

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a bug report
+about: Create a bug report. Not to be used for help requests or server configuration issues. We appreciate if you prefer posting bug reports on weekdays rather than weekends.
 title: ''
 labels: ''
 assignees: ''

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,5 @@
+blank_issues_enabled: false
 contact_links:
   - name: EspoCRM forum
     url: https://forum.espocrm.com/
-    about: Please use our forum to ask questions not related to product development
+    about: "Use our forum for help requests and questions not related to product development. We don't provide support on GitHub."

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for EspoCRM
+about: Freature requests are frozen til mid-June 2023. Please post on the forum instead. (Suggest an idea for EspoCRM).
 title: ''
 labels: ''
 assignees: ''

.github/SECURITY.md

@@ -2,7 +2,7 @@
 
 ## Reporting a vulnerability
 
-If you believe you have discovered a vulnerability in EspoCRM please contacts us via [this](https://www.espocrm.com/contacts/) or [this](https://www.espocrm.com/support/) forms.
+If you believe you have discovered a vulnerability in EspoCRM, please contacts us via [this](https://www.espocrm.com/contacts/) or [this](https://www.espocrm.com/support/) forms. Or create a private vulnerability report on GitHub.
 
 ## Supported versions
 

.github/workflows/test-integration-pg.yml

@@ -0,0 +1,63 @@
+name: Test Integration on PostgreSQL
+
+on:
+    schedule:
+        - cron:  '0 11 * * *'
+
+jobs:
+  test:
+    name: Test on PHP ${{ matrix.php-versions }}
+    runs-on: ubuntu-20.04
+    env:
+      TEST_DATABASE_HOST: '127.0.0.1'
+      TEST_DATABASE_PLATFORM: 'Postgresql'
+      TEST_DATABASE_CHARSET: 'utf8'
+      TEST_DATABASE_PORT: '8888'
+      TEST_DATABASE_NAME: integration_test
+      TEST_DATABASE_USER: postgres
+      TEST_DATABASE_PASSWORD: password
+    services:
+      postgres:
+        image: postgres:15.2
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: integration_test
+        ports:
+          - '8888:5432'
+        options: >-
+            --health-cmd pg_isready
+            --health-interval 10s
+            --health-timeout 5s
+            --health-retries 5
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['8.2']
+        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: NPM install
+      run: npm install
+
+    - name: Build
+      run: grunt test
+
+    - name: Integration testing
+      run: vendor/bin/phpunit --testsuite integration-pg

.idea/.gitignore

@@ -4,3 +4,4 @@
 !/fileTemplates
 !/inspectionProfiles
 !misc.xml
+!jsonSchemas.xml

.idea/codeStyles/Project.xml

@@ -6,6 +6,11 @@
       <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
       <option name="FORCE_EMPTY_METHODS_IN_ONE_LINE" value="true" />
     </PHPCodeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="PHP">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />

.idea/inspectionProfiles/Project_Default.xml

@@ -14,6 +14,8 @@
     </inspection_tool>
     <inspection_tool class="PhpSwitchStatementWitSingleBranchInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PsalmAdvanceCallableParamsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlDialectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="TrivialIfJS" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </component>

.vscode/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!settings.json

.vscode/settings.json

@@ -0,0 +1,422 @@
+{
+    "json.schemas": [
+        {
+            "fileMatch": [
+                "*/Resources/routes.json"
+            ],
+            "url": "./schema/routes.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/module.json"
+            ],
+            "url": "./schema/routes.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/layouts/*/detail.json",
+                "*/Resources/layouts/*/detailSmall.json",
+                "*/Resources/layouts/*/detailConvert.json"
+            ],
+            "url": "./schema/layouts/detail.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/layouts/*/list.json",
+                "*/Resources/layouts/*/listSmall.json",
+                "*/Resources/layouts/*/listFor*.json"
+            ],
+            "url": "./schema/layouts/list.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/aclDefs/*.json"
+            ],
+            "url": "./schema/metadata/aclDefs.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/authenticationMethods/*.json"
+            ],
+            "url": "./schema/metadata/authenticationMethods.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/clientDefs/*.json"
+            ],
+            "url": "./schema/metadata/clientDefs.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/dashlets/*.json"
+            ],
+            "url": "./schema/metadata/dashlets.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata//*.json"
+            ],
+            "url": "./schema/metadata/.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/entityAcl/*.json"
+            ],
+            "url": "./schema/metadata/entityAcl.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/entityDefs/*.json"
+            ],
+            "url": "./schema/metadata/entityDefs.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/fields/*.json"
+            ],
+            "url": "./schema/metadata/fields.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/integrations/*.json"
+            ],
+            "url": "./schema/metadata/integrations.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/notificationDefs/*.json"
+            ],
+            "url": "./schema/metadata/notificationDefs.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/pdfDefs/*.json"
+            ],
+            "url": "./schema/metadata/pdfDefs.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/recordDefs/*.json"
+            ],
+            "url": "./schema/metadata/recordDefs.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/scopes/*.json"
+            ],
+            "url": "./schema/metadata/scopes.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/selectDefs/*.json"
+            ],
+            "url": "./schema/metadata/selectDefs.json"
+        },
+        {
+            "fileMatch": [
+                "*/metadata/streamDefs/*.json"
+            ],
+            "url": "./schema/metadata/streamDefs.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/acl.json"
+            ],
+            "url": "./schema/metadata/app/acl.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/aclPortal.json"
+            ],
+            "url": "./schema/metadata/app/aclPortal.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/actions.json"
+            ],
+            "url": "./schema/metadata/app/actions.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/addressFormats.json"
+            ],
+            "url": "./schema/metadata/app/addressFormats.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/adminPanel.json"
+            ],
+            "url": "./schema/metadata/app/adminPanel.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/api.json"
+            ],
+            "url": "./schema/metadata/app/api.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/appParams.json"
+            ],
+            "url": "./schema/metadata/app/appParams.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/authentication.json"
+            ],
+            "url": "./schema/metadata/app/authentication.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/authentication2FAMethods.json"
+            ],
+            "url": "./schema/metadata/app/authentication2FAMethods.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/cleanup.json"
+            ],
+            "url": "./schema/metadata/app/cleanup.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/client.json"
+            ],
+            "url": "./schema/metadata/app/client.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/clientRoutes.json"
+            ],
+            "url": "./schema/metadata/app/clientRoutes.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/complexExpression.json"
+            ],
+            "url": "./schema/metadata/app/complexExpression.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/config.json"
+            ],
+            "url": "./schema/metadata/app/config.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/consoleCommands.json"
+            ],
+            "url": "./schema/metadata/app/consoleCommands.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/containerServices.json"
+            ],
+            "url": "./schema/metadata/app/containerServices.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/currency.json"
+            ],
+            "url": "./schema/metadata/app/currency.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/currencyConversion.json"
+            ],
+            "url": "./schema/metadata/app/currencyConversion.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/databasePlatforms.json"
+            ],
+            "url": "./schema/metadata/app/databasePlatforms.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/dateTime.json"
+            ],
+            "url": "./schema/metadata/app/dateTime.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/defaultDashboardLayouts.json"
+            ],
+            "url": "./schema/metadata/app/defaultDashboardLayouts.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/defaultDashboardOptions.json"
+            ],
+            "url": "./schema/metadata/app/defaultDashboardOptions.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/entityManagerParams.json"
+            ],
+            "url": "./schema/metadata/app/entityManagerParams.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/entityTemplateList.json"
+            ],
+            "url": "./schema/metadata/app/entityTemplateList.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/export.json"
+            ],
+            "url": "./schema/metadata/app/export.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/fieldProcessing.json"
+            ],
+            "url": "./schema/metadata/app/fieldProcessing.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/file.json"
+            ],
+            "url": "./schema/metadata/app/file.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/fileStorage.json"
+            ],
+            "url": "./schema/metadata/app/fileStorage.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/formula.json"
+            ],
+            "url": "./schema/metadata/app/formula.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/hook.json"
+            ],
+            "url": "./schema/metadata/app/hook.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/image.json"
+            ],
+            "url": "./schema/metadata/app/image.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/jsLibs.json"
+            ],
+            "url": "./schema/metadata/app/jsLibs.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/language.json"
+            ],
+            "url": "./schema/metadata/app/language.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/linkManager.json"
+            ],
+            "url": "./schema/metadata/app/linkManager.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/massActions.json"
+            ],
+            "url": "./schema/metadata/app/massActions.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/metadata.json"
+            ],
+            "url": "./schema/metadata/app/metadata.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/orm.json"
+            ],
+            "url": "./schema/metadata/app/orm.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/pdfEngines.json"
+            ],
+            "url": "./schema/metadata/app/pdfEngines.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/popupNotifications.json"
+            ],
+            "url": "./schema/metadata/app/popupNotifications.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/portalContainerServices.json"
+            ],
+            "url": "./schema/metadata/app/portalContainerServices.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/rebuild.json"
+            ],
+            "url": "./schema/metadata/app/rebuild.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/recordId.json"
+            ],
+            "url": "./schema/metadata/app/recordId.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/regExpPatterns.json"
+            ],
+            "url": "./schema/metadata/app/regExpPatterns.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/relationships.json"
+            ],
+            "url": "./schema/metadata/app/relationships.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/scheduledJobs.json"
+            ],
+            "url": "./schema/metadata/app/scheduledJobs.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/select.json"
+            ],
+            "url": "./schema/metadata/app/select.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/smsProviders.json"
+            ],
+            "url": "./schema/metadata/app/smsProviders.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/templateHelpers.json"
+            ],
+            "url": "./schema/metadata/app/templateHelpers.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/templates.json"
+            ],
+            "url": "./schema/metadata/app/templates.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/webSocket.json"
+            ],
+            "url": "./schema/metadata/app/webSocket.json"
+        }
+    ]
+}

Gruntfile.js

@@ -21,10 +21,10 @@
 
 /**
 * * `grunt` - full build;
-* * `grunt dev` - build only items needed for development (takes less time);
+* * `grunt dev` - build for development;
 * * `grunt offline` - build but skip *composer install*;
 * * `grunt internal` - build only libs and css;
-* * `grunt release` - full build plus upgrade packages`;
+* * `grunt release` - full build zipped with upgrade packages`;
 * * `grunt test` - build for tests running;
 * * `grunt run-tests` - build and run unit and integration tests.
 */
@@ -90,7 +90,7 @@ module.exports = grunt => {
         mkdir: {
             tmp: {
                 options: {
-                    mode: 0755,
+                    mode: 0o755,
                     create: [
                         'build/tmp',
                     ],
@@ -110,9 +110,7 @@ module.exports = grunt => {
             beforeFinal: {
                 src: [
                     'build/tmp/custom/Espo/Custom/*',
-                    'build/tmp/custom/Espo/Modules/*',
                     '!build/tmp/custom/Espo/Custom/.htaccess',
-                    '!build/tmp/custom/Espo/Modules/.htaccess',
                     'build/tmp/install/config.php',
                     'build/tmp/vendor/*/*/.git',
                     'build/tmp/custom/Espo/Custom/*',
@@ -236,7 +234,7 @@ module.exports = grunt => {
                 options: {
                     patterns: [
                         {
-                            match: /\# \{\#dev\}(.*)\{\/dev\}/gs,
+                            match: /# \{#dev}(.*)\{\/dev}/gs,
                             replacement: '',
                         }
                     ]
@@ -503,7 +501,8 @@ module.exports = grunt => {
 
     grunt.registerTask('dev', [
         'composer-install-dev',
-        'less',
+        'npm-install',
+        'internal',
     ]);
 
     grunt.registerTask('test', [

README.md

@@ -2,47 +2,72 @@
 
 [![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.
+[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.
+It's a web application with a frontend designed as a single page application and REST API
+backend written in PHP.
 
-[Download](https://www.espocrm.com/download/) the latest release from our website.
+[Download](https://www.espocrm.com/download/) the latest release from our website. Release notes
+and release packages are available at [Releases](https://github.com/espocrm/espocrm/releases) on GitHub.
+
+![Screenshot](https://user-images.githubusercontent.com/1006792/226094559-995dfd2a-a18f-4619-a21b-79a4e671990a.png)
+
+### Demo
+
+You can try the CRM on the online [demo](https://www.espocrm.com/demo/).
 
 ### Requirements
 
 * PHP 8.0 and later;
-* MySQL 5.7 (and later), or MariaDB 10.1 (and later).
+* MySQL 5.7 (and later), or MariaDB 10.2 (and later).
 
 For more information about server configuration see [this article](https://docs.espocrm.com/administration/server-configuration/).
 
 ### Documentation
 
-The documentation for administrators, users and developers is available [here](https://docs.espocrm.com).
+See the [documentation](https://docs.espocrm.com) for administrators, users and developers.
 
 ### Bug reporting
 
-Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our [forum](http://forum.espocrm.com/forum/bug-reports).
+Create a [GitHub issue](https://github.com/espocrm/espocrm/issues/new/choose) or post on our [forum](https://forum.espocrm.com/forum/bug-reports).
 
-### Installing the stable version
+### Installing stable version
 
-See the [instructions](https://docs.espocrm.com/administration/installation/) about installation.
+See installation instructions:
+
+* [Manual installation](https://docs.espocrm.com/administration/installation/) 
+* [Installation by script](https://docs.espocrm.com/administration/installation-by-script/)
+* [Installation with Docker](https://docs.espocrm.com/administration/docker/installation/)
+* [Installation with Traefik](https://docs.espocrm.com/administration/docker/traefik/)
 
 ### Development
 
-* [Getting started](https://docs.espocrm.com/development/how-to-start)
-* [Running tests](https://docs.espocrm.com/development/tests)
-* [Making translation](https://docs.espocrm.com/development/translation)
+See the [developer documentation](https://docs.espocrm.com/development/).
+
+We highly recommend using IDE for development. The backend codebase follows SOLID principles, utilizes interfaces, static typing and generics. We recommend to start learning EspoCRM from the Dependency Injection article in the documentation.
 
 ### 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.
+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:
 
-* *fix* – upcoming maintenance release; fixes should be pushed to this branch;
+* *fix* – upcoming maintenance release; minor fixes should be pushed to this branch;
 * *master* – develop branch; new features should be pushed to this branch;
 * *stable* – last stable release.
 
+### Language
+
+If you want to improve existing translation or add a language that is not available yet, you can contribute on our [POEditor](https://poeditor.com/join/project/gLDKZtUF4i) project. See instructions [here](https://www.espocrm.com/blog/how-to-use-poeditor-to-translate-espocrm/).
+
+Changes on POEditor are usually merged to the GitHub repository before minor releases.
+
+### Community & Support
+
+If you have a question regarding some features, need help or customizations, want to get in touch with other EspoCRM users, or add a feature request, please use our [community forum](https://forum.espocrm.com/). We believe that using the forum to ask for help and share experience allows everyone in the community to contribute and use this knowledge later.
+
 ### License
 
 EspoCRM is published under the GNU GPLv3 [license](https://raw.githubusercontent.com/espocrm/espocrm/master/LICENSE.txt).

application/Espo/Binding.php

@@ -44,6 +44,7 @@ class Binding implements BindingProcessor
     public function process(Binder $binder): void
     {
         $this->bindServices($binder);
+        $this->bindCore($binder);
         $this->bindMisc($binder);
         $this->bindAcl($binder);
         $this->bindWebSocket($binder);
@@ -63,7 +64,12 @@ class Binding implements BindingProcessor
         );
 
         $binder->bindService(
-            'Espo\\Core\\Container\\Container',
+            'Espo\\Core\\Container',
+            'container'
+        );
+
+        $binder->bindService(
+            'Psr\\Container\\ContainerInterface',
             'container'
         );
 
@@ -72,6 +78,16 @@ class Binding implements BindingProcessor
             'module'
         );
 
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Config',
+            'config'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\File\\Manager',
+            'fileManager'
+        );
+
         $binder->bindService(
             'Espo\\ORM\\EntityManager',
             'entityManager'
@@ -208,8 +224,8 @@ class Binding implements BindingProcessor
         );
 
         $binder->bindService(
-            'Espo\\Core\\Acl',
-            'acl'
+            'Espo\\Core\\Utils\\ClientManager',
+            'clientManager'
         );
 
         $binder->bindService(
@@ -218,6 +234,14 @@ class Binding implements BindingProcessor
         );
     }
 
+    private function bindCore(Binder $binder): void
+    {
+        $binder->bindImplementation(
+            'Espo\\ORM\\PDO\\PDOProvider',
+            'Espo\\ORM\\PDO\\DefaultPDOProvider'
+        );
+    }
+
     private function bindMisc(Binder $binder): void
     {
         $binder->bindImplementation(
@@ -246,7 +270,7 @@ class Binding implements BindingProcessor
             ->for('Espo\\Core\\Authentication\\Oidc\\Login')
             ->bindImplementation(
                 'Espo\\Core\\Authentication\\Oidc\\UserProvider',
-                'Espo\\Core\\Authentication\\Oidc\\DefaultUserProvider'
+                'Espo\\Core\\Authentication\\Oidc\\UserProvider\\DefaultUserProvider'
             );
 
         $binder->bindImplementation(

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

@@ -48,17 +48,12 @@ class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private AclManager $aclManager;
-    private EntityManager $entityManager;
-
     public function __construct(
         DefaultAccessChecker $defaultAccessChecker,
-        AclManager $aclManager,
-        EntityManager $entityManager
+        private AclManager $aclManager,
+        private EntityManager $entityManager
     ) {
         $this->defaultAccessChecker = $defaultAccessChecker;
-        $this->aclManager = $aclManager;
-        $this->entityManager = $entityManager;
     }
 
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
@@ -126,8 +121,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)) {
@@ -150,6 +145,10 @@ class AccessChecker implements AccessEntityCREDChecker
             return null;
         }
 
+        if ($note->getTargetType() === Note::TARGET_ALL) {
+            return true;
+        }
+
         if (!$note->getParentId() || !$note->getParentType()) {
             return null;
         }

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

@@ -126,7 +126,7 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if ($entity->getTargetType() === Note::TARGET_TEAMS) {
-            $targetTeamIdList = $entity->getLinkMultipleIdList('teams') ?? [];
+            $targetTeamIdList = $entity->getLinkMultipleIdList('teams');
 
             foreach ($user->getTeamIdList() as $teamId) {
                 if (in_array($teamId, $targetTeamIdList)) {
@@ -138,7 +138,7 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if ($entity->getTargetType() === Note::TARGET_USERS) {
-            return in_array($user->getId(), $entity->getLinkMultipleIdList('users') ?? []);
+            return in_array($user->getId(), $entity->getLinkMultipleIdList('users'));
         }
 
         return false;

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

@@ -51,8 +51,8 @@ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
         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/AclPortal/Attachment/AccessChecker.php

@@ -131,8 +131,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/Note/AccessChecker.php

@@ -118,7 +118,7 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if ($entity->getTargetType() === Note::TARGET_PORTALS) {
-            return in_array($user->getPortalId(), $entity->getLinkMultipleIdList('portals') ?? []);
+            return in_array($user->getPortalId(), $entity->getLinkMultipleIdList('portals'));
         }
 
         return false;

application/Espo/Classes/AddressFormatters/Formatter1.php

@@ -29,10 +29,8 @@
 
 namespace Espo\Classes\AddressFormatters;
 
-use Espo\Core\{
-    Field\Address,
-    Field\Address\AddressFormatter,
-};
+use Espo\Core\Field\Address;
+use Espo\Core\Field\Address\AddressFormatter;
 
 class Formatter1 implements AddressFormatter
 {

application/Espo/Classes/AddressFormatters/Formatter2.php

@@ -29,10 +29,8 @@
 
 namespace Espo\Classes\AddressFormatters;
 
-use Espo\Core\{
-    Field\Address,
-    Field\Address\AddressFormatter,
-};
+use Espo\Core\Field\Address;
+use Espo\Core\Field\Address\AddressFormatter;
 
 class Formatter2 implements AddressFormatter
 {

application/Espo/Classes/AddressFormatters/Formatter3.php

@@ -29,10 +29,8 @@
 
 namespace Espo\Classes\AddressFormatters;
 
-use Espo\Core\{
-    Field\Address,
-    Field\Address\AddressFormatter,
-};
+use Espo\Core\Field\Address;
+use Espo\Core\Field\Address\AddressFormatter;
 
 class Formatter3 implements AddressFormatter
 {

application/Espo/Classes/AddressFormatters/Formatter4.php

@@ -29,10 +29,8 @@
 
 namespace Espo\Classes\AddressFormatters;
 
-use Espo\Core\{
-    Field\Address,
-    Field\Address\AddressFormatter,
-};
+use Espo\Core\Field\Address;
+use Espo\Core\Field\Address\AddressFormatter;
 
 class Formatter4 implements AddressFormatter
 {

application/Espo/Classes/AppInfo/Container.php

@@ -29,23 +29,14 @@
 
 namespace Espo\Classes\AppInfo;
 
-use Espo\Core\{
-    Container as ContainerService,
-    Utils\Metadata,
-    Console\Command\Params,
-};
+use Espo\Core\Console\Command\Params;
+use Espo\Core\Container as ContainerService;
+use Espo\Core\Utils\Metadata;
 
 class Container
 {
-    private $container;
-
-    private $metadata;
-
-    public function __construct(ContainerService $container, Metadata $metadata)
-    {
-        $this->container = $container;
-        $this->metadata = $metadata;
-    }
+    public function __construct(private ContainerService $container, private Metadata $metadata)
+    {}
 
     public function process(Params $params): string
     {

application/Espo/Classes/ConsoleCommands/CreateAdminUser.php

@@ -0,0 +1,102 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 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\ConsoleCommands;
+
+use Espo\Core\Console\Command;
+use Espo\Core\Console\Command\Params;
+use Espo\Core\Console\IO;
+use Espo\Core\Utils\Config;
+use Espo\Entities\User;
+use Espo\ORM\EntityManager;
+
+use RuntimeException;
+
+class CreateAdminUser implements Command
+{
+    public function __construct(
+        private EntityManager $entityManager,
+        private Config $config
+    ) {}
+
+    public function run(Params $params, IO $io): void
+    {
+        $userName = $params->getArgument(0);
+
+        if (!$userName) {
+            $io->writeLine("A username must be specified as the first argument.");
+            $io->setExitStatus(1);
+
+            return;
+        }
+
+        /** @var ?string $regExp */
+        $regExp = $this->config->get('userNameRegularExpression');
+
+        if (!$regExp) {
+            throw new RuntimeException("No `userNameRegularExpression` in config.");
+        }
+
+        if (
+            str_contains($userName, ' ') ||
+            preg_replace("/{$regExp}/", '_', $userName) !== $userName
+        ) {
+            $io->writeLine("Not allowed username.");
+            $io->setExitStatus(1);
+
+            return;
+        }
+
+        $repository = $this->entityManager->getRDBRepositoryByClass(User::class);
+
+        $existingUser = $repository
+            ->where(['userName' => $userName])
+            ->findOne();
+
+        if ($existingUser) {
+            $io->writeLine("A user with the same username already exists.");
+            $io->setExitStatus(1);
+
+            return;
+        }
+
+        $user = $repository->getNew();
+
+        $user->set('userName', $userName);
+        $user->set('type', User::TYPE_ADMIN);
+        $user->set('name', $userName);
+
+        $repository->save($user);
+
+        $message = "The user '{$userName}' has been created. " .
+            "Set password with the command: `bin/command set-password {$userName}`.";
+
+        $io->writeLine($message);
+    }
+}

application/Espo/Classes/ConsoleCommands/Import.php

@@ -32,26 +32,16 @@ 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,
-    Console\IO,
-};
+use Espo\Core\Console\Command;
+use Espo\Core\Console\Command\Params;
+use Espo\Core\Console\IO;
 
 use Throwable;
 
 class Import implements Command
 {
-    private Service $service;
-
-    private FileManager $fileManager;
-
-    public function __construct(Service $service, FileManager $fileManager)
-    {
-        $this->service = $service;
-        $this->fileManager = $fileManager;
-    }
+    public function __construct(private Service $service, private FileManager $fileManager)
+    {}
 
     public function run(Params $params, IO $io) : void
     {

application/Espo/Classes/ConsoleCommands/PopulateNumbers.php

@@ -63,7 +63,7 @@ class PopulateNumbers implements Command
         $field = $params->getArgument(1);
 
         $orderBy = $params->getOption('orderBy') ?? 'createdAt';
-        $order = $params->getOption('order') ?? Order::ASC;
+        $order = strtoupper($params->getOption('order') ?? Order::ASC);
 
         if (!$entityType) {
             throw new ArgumentNotSpecified("No entity type argument.");
@@ -73,6 +73,10 @@ class PopulateNumbers implements Command
             throw new ArgumentNotSpecified("No field argument.");
         }
 
+        if ($order !== Order::ASC && $order !== Order::DESC) {
+            throw new InvalidArgument("Bad order option.");
+        }
+
         $fieldType = $this->entityManager
             ->getDefs()
             ->getEntity($entityType)

application/Espo/Classes/DuplicateWhereBuilders/Company.php

@@ -33,22 +33,21 @@ 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,
-    Query\Part\WhereItem,
-    Query\Part\Where\OrGroup,
-    Entity,
-};
+use Espo\ORM\Entity;
+use Espo\ORM\Query\Part\Condition as Cond;
+use Espo\ORM\Query\Part\Where\OrGroup;
+use Espo\ORM\Query\Part\WhereItem;
 
 /**
  * @implements WhereBuilder<CoreEntity>
  */
 class Company implements WhereBuilder
 {
+    /**
+     * @param CoreEntity $entity
+     */
     public function build(Entity $entity): ?WhereItem
     {
-        assert($entity instanceof CoreEntity);
-
         $orBuilder = OrGroup::createBuilder();
 
         $toCheck = false;

application/Espo/Classes/DuplicateWhereBuilders/Name.php

@@ -0,0 +1,54 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 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\DuplicateWhereBuilders;
+
+use Espo\Core\Duplicate\WhereBuilder;
+
+use Espo\ORM\Entity;
+use Espo\ORM\Query\Part\Condition as Cond;
+use Espo\ORM\Query\Part\WhereItem;
+
+/**
+ * @implements WhereBuilder<Entity>
+ */
+class Name implements WhereBuilder
+{
+    public function build(Entity $entity): ?WhereItem
+    {
+        if ($entity->get('name')) {
+            return Cond::equal(
+                Cond::column('name'),
+                $entity->get('name')
+            );
+        }
+
+        return null;
+    }
+}

application/Espo/Classes/DuplicateWhereBuilders/Person.php

@@ -31,27 +31,24 @@ namespace Espo\Classes\DuplicateWhereBuilders;
 
 use Espo\Core\ORM\Entity as CoreEntity;
 
-use Espo\Core\{
-    Duplicate\WhereBuilder,
-    Field\EmailAddressGroup,
-};
+use Espo\Core\Duplicate\WhereBuilder;
+use Espo\Core\Field\EmailAddressGroup;
 
-use Espo\ORM\{
-    Query\Part\Condition as Cond,
-    Query\Part\WhereItem,
-    Query\Part\Where\OrGroup,
-    Entity,
-};
+use Espo\ORM\Entity;
+use Espo\ORM\Query\Part\Condition as Cond;
+use Espo\ORM\Query\Part\Where\OrGroup;
+use Espo\ORM\Query\Part\WhereItem;
 
 /**
  * @implements WhereBuilder<CoreEntity>
  */
 class Person implements WhereBuilder
 {
+    /**
+     * @param CoreEntity $entity
+     */
     public function build(Entity $entity): ?WhereItem
     {
-        assert($entity instanceof CoreEntity);
-
         $orBuilder = OrGroup::createBuilder();
 
         $toCheck = false;

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

@@ -30,31 +30,27 @@
 namespace Espo\Classes\FieldProcessing\Email;
 
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    FieldProcessing\Loader,
-    FieldProcessing\Loader\Params,
-    ORM\EntityManager,
-};
-
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\ORM\EntityManager;
 use Espo\Repositories\Email as EmailRepository;
+use Espo\Entities\Email;
 
 /**
- * @implements Loader<\Espo\Entities\Email>
+ * @implements Loader<Email>
  */
 class AddressDataLoader implements Loader
 {
-    private $entityManager;
-
-    public function __construct(EntityManager $entityManager)
-    {
-        $this->entityManager = $entityManager;
-    }
+    public function __construct(private EntityManager $entityManager)
+    {}
 
+    /**
+     * @param Email $entity
+     */
     public function process(Entity $entity, Params $params): void
     {
         /** @var EmailRepository $repository */
-        $repository = $this->entityManager->getRepository('Email');
+        $repository = $this->entityManager->getRepository(Email::ENTITY_TYPE);
 
         $repository->loadFromField($entity);
         $repository->loadToField($entity);

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

@@ -29,27 +29,21 @@
 
 namespace Espo\Classes\FieldProcessing\Import;
 
+use Espo\Entities\Import;
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    FieldProcessing\Loader,
-    FieldProcessing\Loader\Params,
-    ORM\EntityManager,
-};
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\ORM\EntityManager;
 
 use Espo\Repositories\Import as ImportRepository;
 
 /**
- * @implements Loader<\Espo\Entities\Import>
+ * @implements Loader<Import>
  */
 class CountsLoader implements Loader
 {
-    private $entityManager;
-
-    public function __construct(EntityManager $entityManager)
-    {
-        $this->entityManager = $entityManager;
-    }
+    public function __construct(private EntityManager $entityManager)
+    {}
 
     public function process(Entity $entity, Params $params): void
     {

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

@@ -30,16 +30,12 @@
 namespace Espo\Classes\FieldProcessing\Note;
 
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    FieldProcessing\Loader,
-    FieldProcessing\Loader\Params,
-};
-
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
 use Espo\Entities\Note;
 
 /**
- * @implements Loader<\Espo\Entities\Note>
+ * @implements Loader<Note>
  */
 class AttachmentsLoader implements Loader
 {

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

@@ -33,19 +33,16 @@ use Espo\ORM\Entity;
 
 use Espo\Repositories\Portal as PortalRepository;
 use Espo\Entities\Portal;
-
-use Espo\Core\{
-    FieldProcessing\Loader,
-    FieldProcessing\Loader\Params,
-    ORM\EntityManager,
-};
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\ORM\EntityManager;
 
 /**
- * @implements Loader<\Espo\Entities\Portal>
+ * @implements Loader<Portal>
  */
 class UrlLoader implements Loader
 {
-    private $entityManager;
+    private EntityManager $entityManager;
 
     public function __construct(EntityManager $entityManager)
     {

application/Espo/Classes/FieldValidators/ArrayType.php

@@ -38,17 +38,10 @@ use stdClass;
 
 class ArrayType
 {
-    private Metadata $metadata;
+    private const DEFAULT_MAX_ITEM_LENGTH = 100;
 
-    private Defs $defs;
-
-    private const DEFAULT_MAX_LENGTH = 100;
-
-    public function __construct(Metadata $metadata, Defs $defs)
-    {
-        $this->metadata = $metadata;
-        $this->defs = $defs;
-    }
+    public function __construct(protected Metadata $metadata, private Defs $defs)
+    {}
 
     public function checkRequired(Entity $entity, string $field): bool
     {
@@ -135,6 +128,14 @@ class ArrayType
 
         /** @var ?string $path */
         $path = $fieldDefs->getParam('optionsPath');
+        /** @var ?string $path */
+        $ref = $fieldDefs->getParam('optionsReference');
+
+        if (!$path && $ref && str_contains($ref, '.')) {
+            [$refEntityType, $refField] = explode('.', $ref);
+
+            $path = "entityDefs.{$refEntityType}.fields.{$refField}.options";
+        }
 
         /** @var string[]|null|false $optionList */
         $optionList = $path ?
@@ -181,9 +182,9 @@ class ArrayType
         return false;
     }
 
-    public function checkMaxLength(Entity $entity, string $field, ?int $validationValue): bool
+    public function checkMaxItemLength(Entity $entity, string $field, ?int $validationValue): bool
     {
-        $maxLength = $validationValue ?? self::DEFAULT_MAX_LENGTH;
+        $maxLength = $validationValue ?? self::DEFAULT_MAX_ITEM_LENGTH;
 
         /** @var string[] $value */
         $value = $entity->get($field) ?? [];

application/Espo/Classes/FieldValidators/AuthenticationProvider/MethodValid.php

@@ -0,0 +1,62 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 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\AuthenticationProvider;
+
+use Espo\Core\FieldValidation\Validator;
+use Espo\Core\FieldValidation\Validator\Data;
+use Espo\Core\FieldValidation\Validator\Failure;
+use Espo\Core\Utils\Metadata;
+use Espo\Entities\AuthenticationProvider;
+use Espo\ORM\Entity;
+
+/**
+ * @implements Validator<AuthenticationProvider>
+ */
+class MethodValid implements Validator
+{
+    public function __construct(private Metadata $metadata) {}
+
+    public function validate(Entity $entity, string $field, Data $data): ?Failure
+    {
+        $value = $entity->get($field);
+
+        if (!$value) {
+            return Failure::create();
+        }
+
+        $isAvailable = $this->metadata->get(['authenticationMethods', $value, 'provider', 'isAvailable']);
+
+        if (!$isAvailable) {
+            return Failure::create();
+        }
+
+        return null;
+    }
+}

application/Espo/Classes/FieldValidators/CurrencyType.php

@@ -29,11 +29,15 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Field\Currency;
 use Espo\Core\Utils\Config;
+use Espo\ORM\BaseEntity;
 use Espo\ORM\Entity;
 
 class CurrencyType extends FloatType
 {
+    private const DEFAULT_PRECISION = 13;
+
     public function __construct(private Config $config) {}
 
     protected function isNotEmpty(Entity $entity, string $field): bool
@@ -44,6 +48,62 @@ class CurrencyType extends FloatType
             $entity->get($field . 'Currency') !== '';
     }
 
+    public function checkValid(Entity $entity, string $field): bool
+    {
+        if (!$this->isNotEmpty($entity, $field)) {
+            return true;
+        }
+
+        if ($entity->getAttributeType($field) !== Entity::VARCHAR) {
+            return true;
+        }
+
+        /** @var string $value */
+        $value = $entity->get($field);
+
+        if (preg_match('/-?[0-9]+\\.?[0-9]*/', $value)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function checkInPermittedRange(Entity $entity, string $field): bool
+    {
+        if (!$this->isNotEmpty($entity, $field)) {
+            return true;
+        }
+
+        if ($entity->getAttributeType($field) !== Entity::VARCHAR) {
+            return true;
+        }
+
+        if (!$entity instanceof BaseEntity) {
+            return true;
+        }
+
+        /** @var int $precision */
+        $precision = $entity->getAttributeParam($field, 'precision') ?? self::DEFAULT_PRECISION;
+
+        $value = $entity->get($field);
+
+        $currency = Currency::create($value, 'USD');
+
+        if ($currency->isNegative()) {
+            $currency = $currency->multiply(-1);
+        }
+
+        $pad = str_pad('', $precision, '9');
+
+        $limit = Currency::create($pad, 'USD');
+
+        if ($currency->compare($limit) === 1) {
+            return false;
+        }
+
+        return true;
+    }
+
     public function checkValidCurrency(Entity $entity, string $field): bool
     {
         $attribute = $field . 'Currency';

application/Espo/Classes/FieldValidators/Email/Addresses/MaxCount.php

@@ -0,0 +1,76 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 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\Addresses;
+
+use Espo\Core\FieldValidation\Validator;
+use Espo\Core\FieldValidation\Validator\Data;
+use Espo\Core\FieldValidation\Validator\Failure;
+use Espo\Core\Utils\Config;
+use Espo\Entities\Email;
+use Espo\ORM\Entity;
+
+use LogicException;
+
+/**
+ * @implements Validator<Email>
+ */
+class MaxCount implements Validator
+{
+    private const MAX_COUNT = 100;
+
+    public function __construct(private Config $config) {}
+
+    /**
+     * @param Email $entity
+     */
+    public function validate(Entity $entity, string $field, Data $data): ?Failure
+    {
+        if ($field === 'to') {
+            $addresses = $entity->getToAddressList();
+        }
+        else if ($field === 'cc') {
+            $addresses = $entity->getCcAddressList();
+        }
+        else if ($field === 'bcc') {
+            $addresses = $entity->getBccAddressList();
+        }
+        else {
+            throw new LogicException();
+        }
+
+        $maxCount = $this->config->get('emailRecipientAddressMaxCount') ?? self::MAX_COUNT;
+
+        if (count($addresses) > $maxCount) {
+            return Failure::create();
+        }
+
+        return null;
+    }
+}

application/Espo/Classes/FieldValidators/Email/Addresses/Valid.php

@@ -0,0 +1,71 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 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\Addresses;
+
+use Espo\Core\FieldValidation\Validator;
+use Espo\Core\FieldValidation\Validator\Data;
+use Espo\Core\FieldValidation\Validator\Failure;
+use Espo\ORM\Entity;
+use Espo\Entities\Email;
+
+use LogicException;
+
+/**
+ * @implements Validator<Email>
+ */
+class Valid implements Validator
+{
+    /**
+     * @param Email $entity
+     */
+    public function validate(Entity $entity, string $field, Data $data): ?Failure
+    {
+        if ($field === 'to') {
+            $addresses = $entity->getToAddressList();
+        }
+        else if ($field === 'cc') {
+            $addresses = $entity->getCcAddressList();
+        }
+        else if ($field === 'bcc') {
+            $addresses = $entity->getBccAddressList();
+        }
+        else {
+            throw new LogicException();
+        }
+
+        foreach ($addresses as $address) {
+            if (!filter_var($address, FILTER_VALIDATE_EMAIL)) {
+                return Failure::create();
+            }
+        }
+
+        return null;
+    }
+}

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

@@ -29,13 +29,17 @@
 
 namespace Espo\Classes\FieldValidators\Email;
 
+use Espo\Entities\Email;
 use Espo\ORM\Entity;
 
 class EmailAddresses
 {
+    /**
+     * @param Email $entity
+     */
     public function checkRequired(Entity $entity, string $field): bool
     {
-        if ($entity->get('status') === 'Draft') {
+        if ($entity->getStatus() === Email::STATUS_DRAFT) {
             return true;
         }
 

application/Espo/Classes/FieldValidators/EnumType.php

@@ -37,7 +37,6 @@ use Espo\ORM\Entity;
 class EnumType
 {
     private Metadata $metadata;
-
     private Defs $defs;
 
     private const DEFAULT_MAX_LENGTH = 255;
@@ -65,6 +64,14 @@ class EnumType
 
         /** @var ?string $path */
         $path = $fieldDefs->getParam('optionsPath');
+        /** @var ?string $path */
+        $ref = $fieldDefs->getParam('optionsReference');
+
+        if (!$path && $ref && str_contains($ref, '.')) {
+            [$refEntityType, $refField] = explode('.', $ref);
+
+            $path = "entityDefs.{$refEntityType}.fields.{$refField}.options";
+        }
 
         /** @var string[]|null|false $optionList */
         $optionList = $path ?

application/Espo/Classes/FieldValidators/LinkMultipleType.php

@@ -117,7 +117,7 @@ class LinkMultipleType
             return true;
         }
 
-        /** @var ?array<string,string> $columnsMap */
+        /** @var ?array<string, string> $columnsMap */
         $columnsMap = $fieldDefs->getParam('columns');
 
         if ($columnsMap === null || $columnsMap === []) {

application/Espo/Classes/FieldValidators/PersonNameType.php

@@ -30,19 +30,12 @@
 namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Utils\FieldUtil,
-};
+use Espo\Core\Utils\FieldUtil;
 
 class PersonNameType
 {
-    private $fieldUtil;
-
-    public function __construct(FieldUtil $fieldUtil)
-    {
-        $this->fieldUtil = $fieldUtil;
-    }
+    public function __construct(private FieldUtil $fieldUtil)
+    {}
 
     public function checkRequired(Entity $entity, string $field): bool
     {

application/Espo/Classes/FieldValidators/UrlMultipleType.php

@@ -0,0 +1,55 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 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;
+
+use Espo\ORM\Entity;
+
+class UrlMultipleType extends ArrayType
+{
+    private const MAX_ITEM_LENGTH = 255;
+
+    public function checkNoEmptyString(Entity $entity, string $field, ?bool $validationValue): bool
+    {
+        return parent::checkNoEmptyString($entity, $field, true);
+    }
+
+    public function checkMaxItemLength(Entity $entity, string $field, ?int $validationValue): bool
+    {
+        return parent::checkMaxItemLength($entity, $field, self::MAX_ITEM_LENGTH);
+    }
+
+    public function checkPattern(Entity $entity, string $field, ?string $validationValue): bool
+    {
+        /** @var string $pattern */
+        $pattern = $this->metadata->get(['app', 'regExpPatterns', 'uriOptionalProtocol', 'pattern']);
+
+        return parent::checkPattern($entity, $field, $pattern);
+    }
+}

application/Espo/Classes/JobPreparators/CheckEmailAccounts.php

@@ -29,31 +29,28 @@
 
 namespace Espo\Classes\JobPreparators;
 
-use Espo\Core\Utils\DateTime;
-use Espo\Core\Job\Job\Status;
 use Espo\Core\Job\Preparator;
 use Espo\Core\Job\Preparator\Data;
-
-use Espo\Entities\EmailAccount;
 use Espo\ORM\EntityManager;
-
-use Espo\Entities\Job as JobEntity;
+use Espo\Entities\EmailAccount;
+use Espo\Core\Job\Preparator\CollectionHelper;
 
 use DateTimeImmutable;
 
 class CheckEmailAccounts implements Preparator
 {
-    private EntityManager $entityManager;
-
-    public function __construct(EntityManager $entityManager)
-    {
-        $this->entityManager = $entityManager;
-    }
+    /**
+     * @param CollectionHelper<EmailAccount> $helper
+     */
+    public function __construct(
+        private EntityManager $entityManager,
+        private CollectionHelper $helper
+    ) {}
 
     public function prepare(Data $data, DateTimeImmutable $executeTime): void
     {
         $collection = $this->entityManager
-            ->getRDBRepository(EmailAccount::ENTITY_TYPE)
+            ->getRDBRepositoryByClass(EmailAccount::class)
             ->join('assignedUser', 'assignedUserAdditional')
             ->where([
                 'status' => EmailAccount::STATUS_ACTIVE,
@@ -62,49 +59,6 @@ class CheckEmailAccounts implements Preparator
             ])
             ->find();
 
-        foreach ($collection as $entity) {
-            $running = $this->entityManager
-                ->getRDBRepository(JobEntity::ENTITY_TYPE)
-                ->where([
-                    'scheduledJobId' => $data->getId(),
-                    'status' => [
-                        Status::RUNNING,
-                        Status::READY,
-                    ],
-                    'targetType' => EmailAccount::ENTITY_TYPE,
-                    'targetId' => $entity->getId(),
-                ])
-                ->findOne();
-
-            if ($running) {
-                continue;
-            }
-
-            $countPending = $this->entityManager
-                ->getRDBRepository(JobEntity::ENTITY_TYPE)
-                ->where([
-                    'scheduledJobId' => $data->getId(),
-                    'status' => Status::PENDING,
-                    'targetType' => EmailAccount::ENTITY_TYPE,
-                    'targetId' => $entity->getId(),
-                ])
-                ->count();
-
-            if ($countPending > 1) {
-                continue;
-            }
-
-            $jobEntity = $this->entityManager->getNewEntity(JobEntity::ENTITY_TYPE);
-
-            $jobEntity->set([
-                'name' => $data->getName(),
-                'scheduledJobId' => $data->getId(),
-                'executeTime' => $executeTime->format(DateTime::SYSTEM_DATE_TIME_FORMAT),
-                'targetType' => EmailAccount::ENTITY_TYPE,
-                'targetId' => $entity->getId(),
-            ]);
-
-            $this->entityManager->saveEntity($jobEntity);
-        }
+        $this->helper->prepare($collection, $data, $executeTime);
     }
 }

application/Espo/Classes/JobPreparators/CheckInboundEmails.php

@@ -29,80 +29,34 @@
 
 namespace Espo\Classes\JobPreparators;
 
-use Espo\Core\Utils\DateTime;
-use Espo\Core\Job\Job\Status;
 use Espo\Core\Job\Preparator;
 use Espo\Core\Job\Preparator\Data;
-
-use Espo\Entities\InboundEmail;
 use Espo\ORM\EntityManager;
-
-use Espo\Entities\Job as JobEntity;
+use Espo\Entities\InboundEmail;
+use Espo\Core\Job\Preparator\CollectionHelper;
 
 use DateTimeImmutable;
 
 class CheckInboundEmails implements Preparator
 {
-    private $entityManager;
-
-    public function __construct(EntityManager $entityManager)
-    {
-        $this->entityManager = $entityManager;
-    }
+    /**
+     * @param CollectionHelper<InboundEmail> $helper
+     */
+    public function __construct(
+        private EntityManager $entityManager,
+        private CollectionHelper $helper
+    ) {}
 
     public function prepare(Data $data, DateTimeImmutable $executeTime): void
     {
         $collection = $this->entityManager
-            ->getRDBRepository(InboundEmail::ENTITY_TYPE)
+            ->getRDBRepositoryByClass(InboundEmail::class)
             ->where([
                 'status' => InboundEmail::STATUS_ACTIVE,
                 'useImap' => true,
             ])
             ->find();
 
-        foreach ($collection as $entity) {
-            $running = $this->entityManager
-                ->getRDBRepository(JobEntity::ENTITY_TYPE)
-                ->where([
-                    'scheduledJobId' => $data->getId(),
-                    'status' => [
-                        Status::RUNNING,
-                        Status::READY,
-                    ],
-                    'targetType' => InboundEmail::ENTITY_TYPE,
-                    'targetId' => $entity->getId(),
-                ])
-                ->findOne();
-
-            if ($running) {
-                continue;
-            }
-
-            $countPending = $this->entityManager
-                ->getRDBRepository(JobEntity::ENTITY_TYPE)
-                ->where([
-                    'scheduledJobId' => $data->getId(),
-                    'status' => Status::PENDING,
-                    'targetType' => InboundEmail::ENTITY_TYPE,
-                    'targetId' => $entity->getId(),
-                ])
-                ->count();
-
-            if ($countPending > 1) {
-                continue;
-            }
-
-            $jobEntity = $this->entityManager->getNewEntity(JobEntity::ENTITY_TYPE);
-
-            $jobEntity->set([
-                'name' => $data->getName(),
-                'scheduledJobId' => $data->getId(),
-                'executeTime' => $executeTime->format(DateTime::SYSTEM_DATE_TIME_FORMAT),
-                'targetType' => InboundEmail::ENTITY_TYPE,
-                'targetId' => $entity->getId(),
-            ]);
-
-            $this->entityManager->saveEntity($jobEntity);
-        }
+        $this->helper->prepare($collection, $data, $executeTime);
     }
 }

application/Espo/Classes/Jobs/Cleanup.php

@@ -420,7 +420,7 @@ class Cleanup implements JobDataLess
                 ->from($scope)
                 ->withDeleted()
                 ->where([
-                    'deleted' => 1,
+                    'deleted' => true,
                     'modifiedAt<' => $datetime->format(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT),
                     'modifiedAt>' => $datetimeFrom->format(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT),
                 ])
@@ -609,8 +609,6 @@ class Cleanup implements JobDataLess
 
         $repository->deleteFromDb($entity->getId());
 
-        $query = $this->entityManager->getQueryComposer();
-
         foreach ($entity->getRelationList() as $relation) {
             if ($entity->getRelationType($relation) !== Entity::MANY_MANY) {
                 continue;
@@ -760,9 +758,18 @@ class Cleanup implements JobDataLess
             $service = $this->recordServiceContainer->get($scope);
 
             $whereClause = [
-                'deleted' => 1,
+                'deleted' => true,
             ];
 
+            if (
+                !$this->entityManager
+                    ->getDefs()
+                    ->getEntity($scope)
+                    ->hasAttribute('deleted')
+            ) {
+                continue;
+            }
+
             if ($this->metadata->get(['entityDefs', $scope, 'fields', 'modifiedAt'])) {
                 $whereClause['modifiedAt<'] = $datetime->format(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT);
             }

application/Espo/Classes/Jobs/ProcessWebhookQueue.php

@@ -29,19 +29,13 @@
 
 namespace Espo\Classes\Jobs;
 
-use Espo\Core\{
-    Job\JobDataLess,
-    Webhook\Queue,
-};
+use Espo\Core\Job\JobDataLess;
+use Espo\Core\Webhook\Queue;
 
 class ProcessWebhookQueue implements JobDataLess
 {
-    private $queue;
-
-    public function __construct(Queue $queue)
-    {
-        $this->queue = $queue;
-    }
+    public function __construct(private Queue $queue)
+    {}
 
     public function run(): void
     {

application/Espo/Classes/MassAction/Email/MoveToFolder.php

@@ -41,29 +41,20 @@ use Espo\Entities\EmailFolder;
 use Espo\Entities\GroupEmailFolder;
 use Espo\Entities\User;
 use Espo\ORM\EntityManager;
+use Espo\Tools\Email\Folder;
 use Espo\Tools\Email\InboxService as EmailService;
 use Exception;
 
 class MoveToFolder implements MassAction
 {
-    private const FOLDER_INBOX = 'inbox';
-
-    private QueryBuilder $queryBuilder;
-    private EntityManager $entityManager;
-    private EmailService $service;
-    private User $user;
+    private const FOLDER_INBOX = Folder::INBOX;
 
     public function __construct(
-        QueryBuilder $queryBuilder,
-        EntityManager $entityManager,
-        EmailService $service,
-        User $user
-    ) {
-        $this->queryBuilder = $queryBuilder;
-        $this->entityManager = $entityManager;
-        $this->service = $service;
-        $this->user = $user;
-    }
+        private QueryBuilder $queryBuilder,
+        private EntityManager $entityManager,
+        private EmailService $service,
+        private User $user
+    ) {}
 
     /**
      * @throws BadRequest
@@ -77,7 +68,7 @@ class MoveToFolder implements MassAction
             throw new BadRequest("No folder ID.");
         }
 
-        if ($folderId !== self::FOLDER_INBOX && strpos($folderId, 'group:') !== 0) {
+        if ($folderId !== self::FOLDER_INBOX && !str_starts_with($folderId, 'group:')) {
             $folder = $this->entityManager
                 ->getRDBRepositoryByClass(EmailFolder::class)
                 ->where([
@@ -91,7 +82,7 @@ class MoveToFolder implements MassAction
             }
         }
 
-        if ($folderId && strpos($folderId, 'group:') === 0) {
+        if ($folderId && str_starts_with($folderId, 'group:')) {
             $folder = $this->entityManager
                 ->getRDBRepositoryByClass(GroupEmailFolder::class)
                 ->where(['id' => substr($folderId, 6)])
@@ -117,7 +108,7 @@ class MoveToFolder implements MassAction
             try {
                 $this->service->moveToFolder($email->getId(), $folderId, $this->user->getId());
             }
-            catch (Exception $e) {
+            catch (Exception) {
                 continue;
             }
 

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

@@ -29,48 +29,36 @@
 
 namespace Espo\Classes\MassAction\User;
 
-use Espo\Core\{
-    ApplicationUser,
-    MassAction\Actions\MassDelete as MassDeleteOriginal,
-    MassAction\QueryBuilder,
-    MassAction\Params,
-    MassAction\Result,
-    MassAction\Data,
-    MassAction\MassAction,
-    Acl,
-    ORM\EntityManager,
-    Exceptions\Forbidden,
-};
+use Espo\Core\Acl;
+use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\MassAction\Actions\MassDelete as MassDeleteOriginal;
+use Espo\Core\MassAction\Data;
+use Espo\Core\MassAction\MassAction;
+use Espo\Core\MassAction\Params;
+use Espo\Core\MassAction\QueryBuilder;
+use Espo\Core\MassAction\Result;
+use Espo\Core\ORM\EntityManager;
 
-use Espo\{
-    Entities\User,
-    ORM\Entity,
-};
+use Espo\Core\Utils\SystemUser;
+use Espo\Entities\User;
 
+/**
+ * Extended to forbid removal of own and system users.
+ */
 class MassDelete implements MassAction
 {
-    private MassDeleteOriginal $massDeleteOriginal;
-    private QueryBuilder $queryBuilder;
-    private EntityManager $entityManager;
-    private Acl $acl;
-    private User $user;
-
     public function __construct(
-        MassDeleteOriginal $massDeleteOriginal,
-        QueryBuilder $queryBuilder,
-        EntityManager $entityManager,
-        Acl $acl,
-        User $user
-    ) {
-        $this->massDeleteOriginal = $massDeleteOriginal;
-        $this->queryBuilder = $queryBuilder;
-        $this->entityManager = $entityManager;
-        $this->acl = $acl;
-        $this->user = $user;
-    }
+        private MassDeleteOriginal $massDeleteOriginal,
+        private QueryBuilder $queryBuilder,
+        private EntityManager $entityManager,
+        private Acl $acl,
+        private User $user
+    ) {}
 
     /**
      * @throws Forbidden
+     * @throws BadRequest
      */
     public function process(Params $params, Data $data): Result
     {
@@ -93,7 +81,7 @@ class MassDelete implements MassAction
             ->getRDBRepository(User::ENTITY_TYPE)
             ->clone($query)
             ->sth()
-            ->select(['id'])
+            ->select(['id', 'userName'])
             ->find();
 
         foreach ($collection as $entity) {
@@ -106,9 +94,9 @@ class MassDelete implements MassAction
     /**
      * @throws Forbidden
      */
-    protected function checkEntity(Entity $entity): void
+    private function checkEntity(User $entity): void
     {
-        if ($entity->getId() === ApplicationUser::SYSTEM_USER_ID) {
+        if ($entity->getUserName() === SystemUser::NAME) {
             throw new Forbidden("Can't delete 'system' user.");
         }
 

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

@@ -29,6 +29,7 @@
 
 namespace Espo\Classes\MassAction\User;
 
+use Espo\Core\Exceptions\BadRequest;
 use Espo\Core\MassAction\Actions\MassUpdate as MassUpdateOriginal;
 use Espo\Core\MassAction\QueryBuilder;
 use Espo\Core\MassAction\Params;
@@ -42,24 +43,15 @@ use Espo\Core\Acl\Table;
 
 use Espo\Core\Exceptions\Forbidden;
 
+use Espo\Core\Utils\SystemUser;
 use Espo\Entities\User;
-use Espo\ORM\Entity;
 use Espo\ORM\EntityManager;
 
 use Espo\Tools\MassUpdate\Data as MassUpdateData;
 
 class MassUpdate implements MassAction
 {
-    private MassUpdateOriginal $massUpdateOriginal;
-    private QueryBuilder $queryBuilder;
-    private EntityManager $entityManager;
-    private Acl $acl;
-    private User $user;
-    private FileManager $fileManager;
-    private DataManager $dataManager;
-
     private const PERMISSION = 'massUpdatePermission';
-    private const SYSTEM_USER_ID = 'system';
 
     /** @var string[] */
     private array $notAllowedAttributeList = [
@@ -72,25 +64,18 @@ class MassUpdate implements MassAction
     ];
 
     public function __construct(
-        MassUpdateOriginal $massUpdateOriginal,
-        QueryBuilder $queryBuilder,
-        EntityManager $entityManager,
-        Acl $acl,
-        User $user,
-        FileManager $fileManager,
-        DataManager $dataManager
-    ) {
-        $this->massUpdateOriginal = $massUpdateOriginal;
-        $this->queryBuilder = $queryBuilder;
-        $this->entityManager = $entityManager;
-        $this->acl = $acl;
-        $this->user = $user;
-        $this->fileManager = $fileManager;
-        $this->dataManager = $dataManager;
-    }
+        private MassUpdateOriginal $massUpdateOriginal,
+        private QueryBuilder $queryBuilder,
+        private EntityManager $entityManager,
+        private Acl $acl,
+        private User $user,
+        private FileManager $fileManager,
+        private DataManager $dataManager
+    ) {}
 
     /**
      * @throws Forbidden
+     * @throws BadRequest
      */
     public function process(Params $params, Data $data): Result
     {
@@ -118,7 +103,7 @@ class MassUpdate implements MassAction
             ->getRDBRepository(User::ENTITY_TYPE)
             ->clone($query)
             ->sth()
-            ->select(['id'])
+            ->select(['id', 'userName'])
             ->find();
 
         foreach ($collection as $entity) {
@@ -147,9 +132,9 @@ class MassUpdate implements MassAction
     /**
      * @throws Forbidden
      */
-    private function checkEntity(Entity $entity, MassUpdateData $data): void
+    private function checkEntity(User $entity, MassUpdateData $data): void
     {
-        if ($entity->getId() === self::SYSTEM_USER_ID) {
+        if ($entity->getUserName() === SystemUser::NAME) {
             throw new Forbidden("Can't update 'system' user.");
         }
 

application/Espo/Classes/Select/ActionHistoryRecord/AccessControlFilters/OnlyOwn.php

@@ -29,20 +29,14 @@
 
 namespace Espo\Classes\Select\ActionHistoryRecord\AccessControlFilters;
 
-use Espo\{
-    Core\Select\AccessControl\Filter,
-    ORM\Query\SelectBuilder as QueryBuilder,
-    Entities\User,
-};
+use Espo\Core\Select\AccessControl\Filter;
+use Espo\Entities\User;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class OnlyOwn implements Filter
 {
-    private $user;
-
-    public function __construct(User $user)
-    {
-        $this->user = $user;
-    }
+    public function __construct(private User $user)
+    {}
 
     public function apply(QueryBuilder $queryBuilder): void
     {

application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php

@@ -29,22 +29,16 @@
 
 namespace Espo\Classes\Select\ActionHistoryRecord\BoolFilters;
 
-use Espo\{
-    Core\Select\Bool\Filter,
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereClause,
-    ORM\Query\Part\Where\OrGroupBuilder,
-    Entities\User,
-};
+use Espo\Core\Select\Bool\Filter;
+use Espo\Entities\User;
+use Espo\ORM\Query\Part\Where\OrGroupBuilder;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class OnlyMy implements Filter
 {
-    private $user;
-
-    public function __construct(User $user)
-    {
-        $this->user = $user;
-    }
+    public function __construct(private User $user)
+    {}
 
     public function apply(QueryBuilder $queryBuilder, OrGroupBuilder $orGroupBuilder): void
     {

application/Espo/Classes/Select/Email/AccessControlFilters/OnlyOwn.php

@@ -29,34 +29,23 @@
 
 namespace Espo\Classes\Select\Email\AccessControlFilters;
 
-use Espo\Core\{
-    Select\AccessControl\Filter,
-};
+use Espo\Core\Select\AccessControl\Filter;
 
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    Classes\Select\Email\Helpers\JoinHelper,
-    Entities\User,
-};
+use Espo\Classes\Select\Email\Helpers\JoinHelper;
+use Espo\Entities\User;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class OnlyOwn implements Filter
 {
-    private $user;
-
-    private $joinHelper;
-
-    public function __construct(User $user, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(
+        private User $user,
+        private JoinHelper $joinHelper
+    ) {}
 
     public function apply(QueryBuilder $queryBuilder): void
     {
         $this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
 
-        $queryBuilder->where([
-            'emailUser.userId' => $this->user->getId(),
-        ]);
+        $queryBuilder->where(['emailUser.userId' => $this->user->getId()]);
     }
 }

application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php

@@ -29,39 +29,47 @@
 
 namespace Espo\Classes\Select\Email\AccessControlFilters;
 
-use Espo\Core\{
-    Select\AccessControl\Filter,
-};
+use Espo\Core\Select\AccessControl\Filter;
 
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    Classes\Select\Email\Helpers\JoinHelper,
-    Entities\User,
-};
+use Espo\Entities\Email;
+use Espo\Entities\Team;
+use Espo\Entities\User;
+use Espo\ORM\Query\Part\Condition as Cond;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class OnlyTeam implements Filter
 {
-    private $user;
-
-    private $joinHelper;
-
-    public function __construct(User $user, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(private User $user)
+    {}
 
     public function apply(QueryBuilder $queryBuilder): void
     {
-        $this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
-
-        $queryBuilder->distinct();
-        $queryBuilder->leftJoin('teams', 'teamsAccess');
-        $queryBuilder->where([
-            'OR' => [
-                'teamsAccessMiddle.teamId' => $this->user->getLinkMultipleIdList('teams'),
+        $subQuery = QueryBuilder::create()
+            ->select('id')
+            ->from(Email::ENTITY_TYPE)
+            ->leftJoin(Team::RELATIONSHIP_ENTITY_TEAM, 'entityTeam', [
+                'entityTeam.entityId:' => 'id',
+                'entityTeam.entityType' => Email::ENTITY_TYPE,
+                'entityTeam.deleted' => false,
+            ])
+            ->leftJoin(Email::RELATIONSHIP_EMAIL_USER, 'emailUser', [
+                'emailUser.emailId:' => 'id',
+                'emailUser.deleted' => false,
                 'emailUser.userId' => $this->user->getId(),
-            ]
-        ]);
+            ])
+            ->where([
+                'OR' => [
+                    'entityTeam.teamId' => $this->user->getTeamIdList(),
+                    'emailUser.userId' => $this->user->getId(),
+                ]
+            ])
+            ->build();
+
+        $queryBuilder->where(
+            Cond::in(
+                Cond::column('id'),
+                $subQuery
+            )
+        );
     }
 }

application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php

@@ -29,27 +29,15 @@
 
 namespace Espo\Classes\Select\Email\AccessControlFilters;
 
-use Espo\Core\{
-    Select\AccessControl\Filter,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    Classes\Select\Email\Helpers\JoinHelper,
-    Entities\User,
-};
+use Espo\Core\Select\AccessControl\Filter;
+use Espo\Classes\Select\Email\Helpers\JoinHelper;
+use Espo\Entities\User;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class PortalOnlyAccount implements Filter
 {
-    private $user;
-
-    private $joinHelper;
-
-    public function __construct(User $user, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(private User $user, private JoinHelper $joinHelper)
+    {}
 
     public function apply(QueryBuilder $queryBuilder): void
     {

application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php

@@ -29,27 +29,15 @@
 
 namespace Espo\Classes\Select\Email\AccessControlFilters;
 
-use Espo\Core\{
-    Select\AccessControl\Filter,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    Classes\Select\Email\Helpers\JoinHelper,
-    Entities\User,
-};
+use Espo\Core\Select\AccessControl\Filter;
+use Espo\Classes\Select\Email\Helpers\JoinHelper;
+use Espo\Entities\User;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class PortalOnlyContact implements Filter
 {
-    private $user;
-
-    private $joinHelper;
-
-    public function __construct(User $user, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(private User $user, private JoinHelper $joinHelper)
+    {}
 
     public function apply(QueryBuilder $queryBuilder): void
     {

application/Espo/Classes/Select/Email/AdditionalAppliers/Main.php

@@ -30,45 +30,53 @@
 namespace Espo\Classes\Select\Email\AdditionalAppliers;
 
 use Espo\Core\Select\Applier\AdditionalApplier;
-use Espo\ORM\Query\SelectBuilder;
 use Espo\Core\Select\SearchParams;
-
 use Espo\Classes\Select\Email\Helpers\JoinHelper;
-
+use Espo\Entities\Email;
 use Espo\Entities\User;
+use Espo\ORM\Query\SelectBuilder;
+use Espo\Tools\Email\Folder;
 
 class Main implements AdditionalApplier
 {
-    private $user;
-
-    private $joinHelper;
-
-    public function __construct(User $user, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(
+        private User $user,
+        private JoinHelper $joinHelper
+    ) {}
 
     public function apply(SelectBuilder $queryBuilder, SearchParams $searchParams): void
     {
         $folder = $this->retrieveFolder($searchParams);
 
-        if ($folder === 'drafts') {
-            $queryBuilder->useIndex('createdById');
-        }
-        else if ($folder === 'important') {
-            // skip
-        }
-        else if ($this->checkApplyDateSentIndex($queryBuilder, $searchParams)) {
-            $queryBuilder->useIndex('dateSent');
-        }
+        $this->applyIndexes($folder, $queryBuilder, $searchParams);
 
-        if ($folder !== 'drafts') {
+        if ($folder !== Folder::DRAFTS) {
             $this->joinEmailUser($queryBuilder);
         }
     }
 
-    protected function joinEmailUser(SelectBuilder $queryBuilder): void
+    private function applyIndexes(?string $folder, SelectBuilder $queryBuilder, SearchParams $searchParams): void
+    {
+        if ($searchParams->getTextFilter()) {
+            return;
+        }
+
+        if ($folder === Folder::IMPORTANT) {
+            return;
+        }
+
+        if ($folder === Folder::DRAFTS) {
+            $queryBuilder->useIndex('createdById');
+
+            return;
+        }
+
+        if ($this->checkApplyDateSentIndex($queryBuilder, $searchParams)) {
+            $queryBuilder->useIndex('dateSent');
+        }
+    }
+
+    private function joinEmailUser(SelectBuilder $queryBuilder): void
     {
         $this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
 
@@ -77,10 +85,10 @@ class Main implements AdditionalApplier
         }
 
         $itemList = [
-            'isRead',
-            'isImportant',
-            'inTrash',
-            'folderId',
+            Email::USERS_COLUMN_IS_READ,
+            Email::USERS_COLUMN_IS_IMPORTANT,
+            Email::USERS_COLUMN_IN_TRASH,
+            Email::USERS_COLUMN_FOLDER_ID,
         ];
 
         foreach ($itemList as $item) {
@@ -88,7 +96,7 @@ class Main implements AdditionalApplier
         }
     }
 
-    protected function retrieveFolder(SearchParams $searchParams): ?string
+    private function retrieveFolder(SearchParams $searchParams): ?string
     {
         if (!$searchParams->getWhere()) {
             return null;
@@ -103,7 +111,7 @@ class Main implements AdditionalApplier
         return null;
     }
 
-    protected function checkApplyDateSentIndex(SelectBuilder $queryBuilder, SearchParams $searchParams): bool
+    private function checkApplyDateSentIndex(SelectBuilder $queryBuilder, SearchParams $searchParams): bool
     {
         if ($searchParams->getTextFilter()) {
             return false;

application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php

@@ -29,26 +29,17 @@
 
 namespace Espo\Classes\Select\Email\BoolFilters;
 
-use Espo\{
-    Core\Select\Bool\Filter,
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereClause,
-    ORM\Query\Part\Where\OrGroupBuilder,
-    Classes\Select\Email\Helpers\JoinHelper,
-    Entities\User,
-};
+use Espo\Classes\Select\Email\Helpers\JoinHelper;
+use Espo\Core\Select\Bool\Filter;
+use Espo\Entities\User;
+use Espo\ORM\Query\Part\Where\OrGroupBuilder;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class OnlyMy implements Filter
 {
-    private $user;
-
-    private $joinHelper;
-
-    public function __construct(User $user, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(private User $user, private JoinHelper $joinHelper)
+    {}
 
     public function apply(QueryBuilder $queryBuilder, OrGroupBuilder $orGroupBuilder): void
     {

application/Espo/Classes/Select/Email/Helpers/JoinHelper.php

@@ -29,9 +29,8 @@
 
 namespace Espo\Classes\Select\Email\Helpers;
 
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-};
+use Espo\Entities\Email;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class JoinHelper
 {
@@ -41,14 +40,10 @@ class JoinHelper
             return;
         }
 
-        $queryBuilder->leftJoin(
-            'EmailUser',
-            'emailUser',
-            [
-                'emailUser.emailId:' => 'id',
-                'emailUser.deleted' => false,
-                'emailUser.userId' => $userId,
-            ]
-        );
+        $queryBuilder->leftJoin(Email::RELATIONSHIP_EMAIL_USER, 'emailUser', [
+            'emailUser.emailId:' => 'id',
+            'emailUser.deleted' => false,
+            'emailUser.userId' => $userId,
+        ]);
     }
 }

application/Espo/Classes/Select/Email/TextFilter.php

@@ -29,6 +29,7 @@
 
 namespace Espo\Classes\Select\Email;
 
+use Espo\Core\Exceptions\Error;
 use Espo\Core\Select\Text\Filter;
 use Espo\Core\Select\Text\Filter\Data;
 use Espo\Core\Select\Text\DefaultFilter;
@@ -44,22 +45,15 @@ use Espo\Entities\EmailAddress;
 
 class TextFilter implements Filter
 {
-    private $defaultFilter;
-
-    private $config;
-
-    private $entityManager;
-
     public function __construct(
-        DefaultFilter $defaultFilter,
-        ConfigProvider $config,
-        EntityManager $entityManager
-    ) {
-        $this->defaultFilter = $defaultFilter;
-        $this->config = $config;
-        $this->entityManager = $entityManager;
-    }
+        private DefaultFilter $defaultFilter,
+        private ConfigProvider $config,
+        private EntityManager $entityManager
+    ) {}
 
+    /**
+     * @throws Error
+     */
     public function apply(QueryBuilder $queryBuilder, Data $data): void
     {
         $filter = $data->getFilter();
@@ -67,7 +61,7 @@ class TextFilter implements Filter
 
         if (
             mb_strlen($filter) < $this->config->getMinLengthForContentSearch() ||
-            strpos($filter, '@') === false ||
+            !str_contains($filter, '@') ||
             $data->forceFullTextSearch()
         ) {
             $this->defaultFilter->apply($queryBuilder, $data);

application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php

@@ -29,32 +29,20 @@
 
 namespace Espo\Classes\Select\Email\Where\ItemConverters;
 
-use Espo\Core\{
-    Select\Where\ItemConverter,
-    Select\Where\Item,
-    Select\Helpers\RandomStringGenerator,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereItem as WhereClauseItem,
-    ORM\Query\Part\WhereClause,
-    Classes\Select\Email\Helpers\EmailAddressHelper,
-};
+use Espo\Core\Select\Helpers\RandomStringGenerator;
+use Espo\Core\Select\Where\Item;
+use Espo\Core\Select\Where\ItemConverter;
+use Espo\Classes\Select\Email\Helpers\EmailAddressHelper;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class EmailAddressEquals implements ItemConverter
 {
-    private $emailAddressHelper;
-
-    private $randomStringGenerator;
-
     public function __construct(
-        EmailAddressHelper $emailAddressHelper,
-        RandomStringGenerator $randomStringGenerator
-    ) {
-        $this->emailAddressHelper = $emailAddressHelper;
-        $this->randomStringGenerator = $randomStringGenerator;
-    }
+        private EmailAddressHelper $emailAddressHelper,
+        private RandomStringGenerator $randomStringGenerator
+    ) {}
 
     public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
     {

application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php

@@ -29,38 +29,18 @@
 
 namespace Espo\Classes\Select\Email\Where\ItemConverters;
 
-use Espo\Core\{
-    Select\Where\ItemConverter,
-    Select\Where\Item,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereItem as WhereClauseItem,
-    ORM\Query\Part\WhereClause,
-    ORM\EntityManager,
-    Classes\Select\Email\Helpers\EmailAddressHelper,
-};
+use Espo\Core\Select\Where\Item;
+use Espo\Core\Select\Where\ItemConverter;
+use Espo\Classes\Select\Email\Helpers\EmailAddressHelper;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class FromEquals implements ItemConverter
 {
-    /**
-     * @var EntityManager
-     */
-    protected $entityManager;
-
-    /**
-     * @var EmailAddressHelper
-     */
-    protected $emailAddressHelper;
-
     public function __construct(
-        EntityManager $entityManager,
-        EmailAddressHelper $emailAddressHelper
-    ) {
-        $this->entityManager = $entityManager;
-        $this->emailAddressHelper = $emailAddressHelper;
-    }
+        private EmailAddressHelper $emailAddressHelper
+    ) {}
 
     public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
     {

application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php

@@ -39,46 +39,29 @@ use Espo\ORM\Query\Part\WhereClause;
 use Espo\ORM\EntityManager;
 use Espo\Entities\User;
 use Espo\Classes\Select\Email\Helpers\JoinHelper;
+use Espo\Tools\Email\Folder;
 
 class InFolder implements ItemConverter
 {
-    private User $user;
-    private EntityManager $entityManager;
-    private JoinHelper $joinHelper;
-
-    public function __construct(User $user, EntityManager $entityManager, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->entityManager = $entityManager;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(
+        private User $user,
+        private EntityManager $entityManager,
+        private JoinHelper $joinHelper
+    ) {}
 
     public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
     {
         $folderId = $item->getValue();
 
-        switch ($folderId) {
-            case 'all':
-                return WhereClause::fromRaw([]);
-
-            case 'inbox':
-                return $this->convertInbox($queryBuilder);
-
-            case 'important':
-                return $this->convertImportant($queryBuilder);
-
-            case 'sent':
-                return $this->convertSent($queryBuilder);
-
-            case 'trash':
-                return $this->convertTrash($queryBuilder);
-
-            case 'drafts':
-                return $this->convertDraft($queryBuilder);
-
-            default:
-                return $this->convertFolderId($queryBuilder, $folderId);
-        }
+        return match ($folderId) {
+            Folder::ALL => WhereClause::fromRaw([]),
+            Folder::INBOX => $this->convertInbox($queryBuilder),
+            Folder::IMPORTANT => $this->convertImportant($queryBuilder),
+            Folder::SENT => $this->convertSent($queryBuilder),
+            Folder::TRASH => $this->convertTrash($queryBuilder),
+            Folder::DRAFTS => $this->convertDraft($queryBuilder),
+            default => $this->convertFolderId($queryBuilder, $folderId),
+        };
     }
 
     protected function convertInbox(QueryBuilder $queryBuilder): WhereClauseItem
@@ -171,7 +154,7 @@ class InFolder implements ItemConverter
     {
         $this->joinEmailUser($queryBuilder);
 
-        if (substr($folderId, 0, 6) === 'group:') {
+        if (str_starts_with($folderId, 'group:')) {
             $groupFolderId = substr($folderId, 6);
 
             if ($groupFolderId === '') {

application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php

@@ -29,30 +29,18 @@
 
 namespace Espo\Classes\Select\Email\Where\ItemConverters;
 
-use Espo\Core\{
-    Select\Where\ItemConverter,
-    Select\Where\Item,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereItem as WhereClauseItem,
-    ORM\Query\Part\WhereClause,
-    Entities\User,
-    Classes\Select\Email\Helpers\JoinHelper,
-};
+use Espo\Core\Select\Where\Item;
+use Espo\Core\Select\Where\ItemConverter;
+use Espo\Classes\Select\Email\Helpers\JoinHelper;
+use Espo\Entities\User;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class IsImportantIsFalse implements ItemConverter
 {
-    private $user;
-
-    private $joinHelper;
-
-    public function __construct(User $user, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(private User $user, private JoinHelper $joinHelper)
+    {}
 
     public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
     {

application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php

@@ -29,30 +29,18 @@
 
 namespace Espo\Classes\Select\Email\Where\ItemConverters;
 
-use Espo\Core\{
-    Select\Where\ItemConverter,
-    Select\Where\Item,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereItem as WhereClauseItem,
-    ORM\Query\Part\WhereClause,
-    Entities\User,
-    Classes\Select\Email\Helpers\JoinHelper,
-};
+use Espo\Core\Select\Where\Item;
+use Espo\Core\Select\Where\ItemConverter;
+use Espo\Classes\Select\Email\Helpers\JoinHelper;
+use Espo\Entities\User;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class IsImportantIsTrue implements ItemConverter
 {
-    private $user;
-
-    private $joinHelper;
-
-    public function __construct(User $user, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(private User $user, private JoinHelper $joinHelper)
+    {}
 
     public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
     {

application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php

@@ -29,30 +29,18 @@
 
 namespace Espo\Classes\Select\Email\Where\ItemConverters;
 
-use Espo\Core\{
-    Select\Where\ItemConverter,
-    Select\Where\Item,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereItem as WhereClauseItem,
-    ORM\Query\Part\WhereClause,
-    Entities\User,
-    Classes\Select\Email\Helpers\JoinHelper,
-};
+use Espo\Core\Select\Where\Item;
+use Espo\Core\Select\Where\ItemConverter;
+use Espo\Classes\Select\Email\Helpers\JoinHelper;
+use Espo\Entities\User;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class IsNotReadIsFalse implements ItemConverter
 {
-    private $user;
-
-    private $joinHelper;
-
-    public function __construct(User $user, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(private User $user, private JoinHelper $joinHelper)
+    {}
 
     public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
     {

application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php

@@ -29,30 +29,18 @@
 
 namespace Espo\Classes\Select\Email\Where\ItemConverters;
 
-use Espo\Core\{
-    Select\Where\ItemConverter,
-    Select\Where\Item,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereItem as WhereClauseItem,
-    ORM\Query\Part\WhereClause,
-    Entities\User,
-    Classes\Select\Email\Helpers\JoinHelper,
-};
+use Espo\Core\Select\Where\Item;
+use Espo\Core\Select\Where\ItemConverter;
+use Espo\Classes\Select\Email\Helpers\JoinHelper;
+use Espo\Entities\User;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class IsNotReadIsTrue implements ItemConverter
 {
-    private $user;
-
-    private $joinHelper;
-
-    public function __construct(User $user, JoinHelper $joinHelper)
-    {
-        $this->user = $user;
-        $this->joinHelper = $joinHelper;
-    }
+    public function __construct(private User $user, private JoinHelper $joinHelper)
+    {}
 
     public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
     {

application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php

@@ -29,16 +29,11 @@
 
 namespace Espo\Classes\Select\Email\Where\ItemConverters;
 
-use Espo\Core\{
-    Select\Where\ItemConverter,
-    Select\Where\Item,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereItem as WhereClauseItem,
-    ORM\Query\Part\WhereClause,
-};
+use Espo\Core\Select\Where\Item;
+use Espo\Core\Select\Where\ItemConverter;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class IsNotRepliedIsFalse implements ItemConverter
 {

application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php

@@ -29,16 +29,11 @@
 
 namespace Espo\Classes\Select\Email\Where\ItemConverters;
 
-use Espo\Core\{
-    Select\Where\ItemConverter,
-    Select\Where\Item,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereItem as WhereClauseItem,
-    ORM\Query\Part\WhereClause,
-};
+use Espo\Core\Select\Where\Item;
+use Espo\Core\Select\Where\ItemConverter;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class IsNotRepliedIsTrue implements ItemConverter
 {

application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php

@@ -29,32 +29,20 @@
 
 namespace Espo\Classes\Select\Email\Where\ItemConverters;
 
-use Espo\Core\{
-    Select\Where\ItemConverter,
-    Select\Where\Item,
-    Select\Helpers\RandomStringGenerator,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereItem as WhereClauseItem,
-    ORM\Query\Part\WhereClause,
-    Classes\Select\Email\Helpers\EmailAddressHelper,
-};
+use Espo\Core\Select\Helpers\RandomStringGenerator;
+use Espo\Core\Select\Where\Item;
+use Espo\Core\Select\Where\ItemConverter;
+use Espo\Classes\Select\Email\Helpers\EmailAddressHelper;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class ToEquals implements ItemConverter
 {
-    private $emailAddressHelper;
-
-    private $randomStringGenerator;
-
     public function __construct(
-        EmailAddressHelper $emailAddressHelper,
-        RandomStringGenerator $randomStringGenerator
-    ) {
-        $this->emailAddressHelper = $emailAddressHelper;
-        $this->randomStringGenerator = $randomStringGenerator;
-    }
+        private EmailAddressHelper $emailAddressHelper,
+        private RandomStringGenerator $randomStringGenerator
+    ) {}
 
     public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
     {

application/Espo/Classes/Select/EmailAccount/AccessControlFilters/Mandatory.php

@@ -29,20 +29,14 @@
 
 namespace Espo\Classes\Select\EmailAccount\AccessControlFilters;
 
-use Espo\{
-    Core\Select\AccessControl\Filter,
-    ORM\Query\SelectBuilder as QueryBuilder,
-    Entities\User,
-};
+use Espo\Core\Select\AccessControl\Filter;
+use Espo\Entities\User;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class Mandatory implements Filter
 {
-    private $user;
-
-    public function __construct(User $user)
-    {
-        $this->user = $user;
-    }
+    public function __construct(private User $user)
+    {}
 
     public function apply(QueryBuilder $queryBuilder): void
     {

application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php

@@ -29,13 +29,11 @@
 
 namespace Espo\Classes\Select\EmailFilter\AccessControlFilters;
 
-use Espo\{
-    Core\Select\AccessControl\Filter,
-    Entities\EmailAccount,
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\EntityManager,
-    Entities\User,
-};
+use Espo\Core\Select\AccessControl\Filter;
+use Espo\Entities\EmailAccount;
+use Espo\Entities\User;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class OnlyOwn implements Filter
 {

application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php

@@ -29,26 +29,18 @@
 
 namespace Espo\Classes\Select\EmailFilter\BoolFilters;
 
-use Espo\{
-    Core\Select\Bool\Filter,
-    Entities\EmailAccount,
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereClause,
-    ORM\Query\Part\Where\OrGroupBuilder,
-    ORM\EntityManager,
-    Entities\User,
-};
+use Espo\Core\Select\Bool\Filter;
+use Espo\Entities\EmailAccount;
+use Espo\Entities\User;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Query\Part\Where\OrGroupBuilder;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class OnlyMy implements Filter
 {
-    private User $user;
-    private  EntityManager $entityManager;
-
-    public function __construct(User $user, EntityManager $entityManager)
-    {
-        $this->user = $user;
-        $this->entityManager = $entityManager;
-    }
+    public function __construct(private User $user, private EntityManager $entityManager)
+    {}
 
     public function apply(QueryBuilder $queryBuilder, OrGroupBuilder $orGroupBuilder): void
     {

application/Espo/Classes/Select/Event/PrimaryFilters/Held.php

@@ -0,0 +1,49 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 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\Select\Event\PrimaryFilters;
+
+use Espo\Core\Select\Primary\Filter;
+use Espo\Core\Utils\Metadata;
+use Espo\ORM\Query\SelectBuilder;
+
+class Held implements Filter
+{
+    public function __construct(
+        private string $entityType,
+        private Metadata $metadata
+    ) {}
+
+    public function apply(SelectBuilder $queryBuilder): void
+    {
+        $statusList = $this->metadata->get(['scopes', $this->entityType, 'completedStatusList']) ?? [];
+
+        $queryBuilder->where(['status' => $statusList]);
+    }
+}

application/Espo/Classes/Select/Event/PrimaryFilters/Planned.php

@@ -0,0 +1,49 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 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\Select\Event\PrimaryFilters;
+
+use Espo\Core\Select\Primary\Filter;
+use Espo\Core\Utils\Metadata;
+use Espo\ORM\Query\SelectBuilder;
+
+class Planned implements Filter
+{
+    public function __construct(
+        private string $entityType,
+        private Metadata $metadata
+    ) {}
+
+    public function apply(SelectBuilder $queryBuilder): void
+    {
+        $statusList = $this->metadata->get(['scopes', $this->entityType, 'activityStatusList']) ?? [];
+
+        $queryBuilder->where(['status' => $statusList]);
+    }
+}

application/Espo/Classes/Select/Event/PrimaryFilters/Todays.php

@@ -0,0 +1,70 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 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\Select\Event\PrimaryFilters;
+
+use Espo\Core\Exceptions\Error;
+use Espo\Core\Select\Primary\Filter;
+use Espo\Core\Select\Helpers\UserTimeZoneProvider;
+use Espo\Core\Select\Where\ConverterFactory;
+use Espo\Core\Select\Where\Item;
+use Espo\ORM\Query\SelectBuilder;
+use Espo\Entities\User;
+use LogicException;
+
+class Todays implements Filter
+{
+    public function __construct(
+        private User $user,
+        private UserTimeZoneProvider $userTimeZoneProvider,
+        private ConverterFactory $converterFactory,
+        private string $entityType
+    ) {}
+
+    public function apply(SelectBuilder $queryBuilder): void
+    {
+        $item = Item::fromRaw([
+            'type' => Item\Type::TODAY,
+            'attribute' => 'dateStart',
+            'timeZone' => $this->userTimeZoneProvider->get(),
+            'dateTime' => true,
+        ]);
+
+        try {
+            $whereItem = $this->converterFactory
+                ->create($this->entityType, $this->user)
+                ->convert($queryBuilder, $item);
+        }
+        catch (Error $e) {
+            throw new LogicException($e->getMessage());
+        }
+
+        $queryBuilder->where($whereItem);
+    }
+}

application/Espo/Classes/Select/Team/AccessControlFilters/OnlyTeam.php

@@ -30,22 +30,14 @@
 namespace Espo\Classes\Select\Team\AccessControlFilters;
 
 use Espo\Entities\User;
-
 use Espo\Core\Select\AccessControl\Filter;
-
-use Espo\ORM\Query\{
-    SelectBuilder,
-    Part\Condition as Cond,
-};
+use Espo\ORM\Query\Part\Condition as Cond;
+use Espo\ORM\Query\SelectBuilder;
 
 class OnlyTeam implements Filter
 {
-    private $user;
-
-    public function __construct(User $user)
-    {
-        $this->user = $user;
-    }
+    public function __construct(private User $user)
+    {}
 
     public function apply(SelectBuilder $queryBuilder): void
     {

application/Espo/Classes/Select/Template/AccessControlFilters/Mandatory.php

@@ -29,33 +29,21 @@
 
 namespace Espo\Classes\Select\Template\AccessControlFilters;
 
-use Espo\ORM\{
-    Query\SelectBuilder,
-    Defs,
-};
-
-use Espo\Core\{
-    Select\AccessControl\Filter,
-    AclManager,
-    Acl\Exceptions\NotImplemented,
-};
+use Espo\ORM\Defs;
+use Espo\ORM\Query\SelectBuilder;
+use Espo\Core\Acl\Exceptions\NotImplemented;
+use Espo\Core\AclManager;
+use Espo\Core\Select\AccessControl\Filter;
 
 use Espo\Entities\User;
 
 class Mandatory implements Filter
 {
-    private $user;
-
-    private $defs;
-
-    private $aclManager;
-
-    public function __construct(User $user, Defs $defs, AclManager $aclManager)
-    {
-        $this->user = $user;
-        $this->defs = $defs;
-        $this->aclManager = $aclManager;
-    }
+    public function __construct(
+        private User $user,
+        private Defs $defs,
+        private AclManager $aclManager
+    ) {}
 
     public function apply(SelectBuilder $queryBuilder): void
     {

application/Espo/Classes/Select/User/AccessControlFilters/Mandatory.php

@@ -30,40 +30,31 @@
 namespace Espo\Classes\Select\User\AccessControlFilters;
 
 use Espo\ORM\Query\SelectBuilder;
-
-use Espo\Core\{
-    Select\AccessControl\Filter,
-    AclManager,
-    Acl\Table,
-};
-
+use Espo\Core\Acl\Table;
+use Espo\Core\AclManager;
+use Espo\Core\Select\AccessControl\Filter;
 use Espo\Entities\User;
 
 class Mandatory implements Filter
 {
-    private $user;
-
-    private $aclManager;
-
-    public function __construct(User $user, AclManager $aclManager)
-    {
-        $this->user = $user;
-        $this->aclManager = $aclManager;
-    }
+    public function __construct(
+        private User $user,
+        private AclManager $aclManager
+    ) {}
 
     public function apply(SelectBuilder $queryBuilder): void
     {
         if (!$this->user->isAdmin()) {
             $queryBuilder->where([
                 'isActive' => true,
-                'type!=' => 'api',
+                'type!=' => User::TYPE_API,
             ]);
         }
 
         if ($this->aclManager->getPermissionLevel($this->user, 'portalPermission') !== Table::LEVEL_YES) {
             $queryBuilder->where([
                 'OR' => [
-                    'type!=' => 'portal',
+                    'type!=' => User::TYPE_PORTAL,
                     'id' => $this->user->getId(),
                 ]
             ]);
@@ -71,12 +62,12 @@ class Mandatory implements Filter
 
         if (!$this->user->isSuperAdmin()) {
             $queryBuilder->where([
-                'type!=' => 'super-admin'
+                'type!=' => User::TYPE_SUPER_ADMIN,
             ]);
         }
 
         $queryBuilder->where([
-            'type!=' => 'system'
+            'type!=' => User::TYPE_SYSTEM,
         ]);
     }
 }

application/Espo/Classes/Select/User/AccessControlFilters/OnlyOwn.php

@@ -30,26 +30,16 @@
 namespace Espo\Classes\Select\User\AccessControlFilters;
 
 use Espo\ORM\Query\SelectBuilder;
-
-use Espo\Core\{
-    Select\AccessControl\Filter,
-    AclManager,
-    Acl\Table,
-};
+use Espo\Core\Acl\Table;
+use Espo\Core\AclManager;
+use Espo\Core\Select\AccessControl\Filter;
 
 use Espo\Entities\User;
 
 class OnlyOwn implements Filter
 {
-    private $user;
-
-    private $aclManager;
-
-    public function __construct(User $user, AclManager $aclManager)
-    {
-        $this->user = $user;
-        $this->aclManager = $aclManager;
-    }
+    public function __construct(private User $user, private AclManager $aclManager)
+    {}
 
     public function apply(SelectBuilder $queryBuilder): void
     {
@@ -57,7 +47,7 @@ class OnlyOwn implements Filter
             $queryBuilder->where([
                 'OR' => [
                     'id' => $this->user->getId(),
-                    'type' => 'portal',
+                    'type' => User::TYPE_PORTAL,
                 ],
             ]);
 

application/Espo/Classes/Select/User/AccessControlFilters/OnlyTeam.php

@@ -31,25 +31,18 @@ namespace Espo\Classes\Select\User\AccessControlFilters;
 
 use Espo\ORM\Query\SelectBuilder;
 
-use Espo\Core\{
-    Select\AccessControl\Filter,
-    AclManager,
-    Acl\Table,
-};
+use Espo\Core\Acl\Table;
+use Espo\Core\AclManager;
+use Espo\Core\Select\AccessControl\Filter;
 
 use Espo\Entities\User;
 
 class OnlyTeam implements Filter
 {
-    private $user;
-
-    private $aclManager;
-
-    public function __construct(User $user, AclManager $aclManager)
-    {
-        $this->user = $user;
-        $this->aclManager = $aclManager;
-    }
+    public function __construct(
+        private User $user,
+        private AclManager $aclManager
+    ) {}
 
     public function apply(SelectBuilder $queryBuilder): void
     {
@@ -59,7 +52,7 @@ class OnlyTeam implements Filter
         ];
 
         if ($this->aclManager->getPermissionLevel($this->user, 'portalPermission') === Table::LEVEL_YES) {
-            $orGroup['type'] = 'portal';
+            $orGroup['type'] = User::TYPE_PORTAL;
         }
 
         $queryBuilder

application/Espo/Classes/Select/User/PrimaryFilters/Internal.php

@@ -30,6 +30,7 @@
 namespace Espo\Classes\Select\User\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
+use Espo\Entities\User;
 use Espo\ORM\Query\SelectBuilder;
 
 class Internal implements Filter
@@ -37,7 +38,11 @@ class Internal implements Filter
     public function apply(SelectBuilder $queryBuilder): void
     {
         $queryBuilder->where([
-            'type!=' => ['portal', 'api', 'system'],
+            'type!=' => [
+                User::TYPE_PORTAL,
+                User::TYPE_API,
+                User::TYPE_SYSTEM,
+            ],
         ]);
     }
 }

application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php

@@ -29,16 +29,12 @@
 
 namespace Espo\Classes\Select\User\Where\ItemConverters;
 
-use Espo\Core\{
-    Select\Where\ItemConverter,
-    Select\Where\Item,
-};
-
-use Espo\{
-    ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereItem as WhereClauseItem,
-    ORM\Query\Part\WhereClause,
-};
+use Espo\Core\Select\Where\Item;
+use Espo\Core\Select\Where\ItemConverter;
+use Espo\Entities\User;
+use Espo\ORM\Query\Part\WhereClause;
+use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 class IsOfType implements ItemConverter
 {
@@ -46,23 +42,21 @@ class IsOfType implements ItemConverter
     {
         $type = $item->getValue();
 
-        switch ($type) {
-            case 'internal':
-                return WhereClause::fromRaw([
-                    'type!=' => ['portal', 'api', 'system'],
-                ]);
-
-            case 'api':
-                return WhereClause::fromRaw([
-                    'type' => 'api',
-                ]);
-
-            case 'portal':
-                return WhereClause::fromRaw([
-                    'type' => 'portal',
-                ]);
-        }
-
-        return WhereClause::fromRaw(['id' => null]);
+        return match ($type) {
+            'internal' => WhereClause::fromRaw([
+                'type!=' => [
+                    User::TYPE_PORTAL,
+                    User::TYPE_API,
+                    User::TYPE_SYSTEM,
+                ],
+            ]),
+            User::TYPE_PORTAL => WhereClause::fromRaw([
+                'type' => User::TYPE_PORTAL,
+            ]),
+            User::TYPE_API => WhereClause::fromRaw([
+                'type' => User::TYPE_API,
+            ]),
+            default => WhereClause::fromRaw(['id' => null]),
+        };
     }
 }

application/Espo/Classes/TemplateHelpers/TableTag.php

@@ -51,8 +51,10 @@ class TableTag implements Helper
 
         $content = $function !== null ? $function() : '';
 
+        $style = "border: {$border}; border-spacing: 0; border-collapse: collapse;";
+
         return Result::createSafeString(
-            "<table border=\"{$border}\" cellpadding=\"{$cellpadding}\" {$attributesPart}>" .
+            "<table style=\"{$style}\" border=\"{$border}\" cellpadding=\"{$cellpadding}\" {$attributesPart}>" .
             $content .
             "</table>"
         );

application/Espo/Classes/TemplateHelpers/TdTag.php

@@ -56,7 +56,7 @@ class TdTag implements Helper
         $content = $function !== null ? $function() : '';
 
         return Result::createSafeString(
-            "<td>" . $content . "</td>"
+            "<td {$attributesPart}>{$content}</td>"
         );
     }
 }

application/Espo/Controllers/Admin.php

@@ -44,30 +44,15 @@ use Espo\Entities\User;
 
 class Admin
 {
-    private Container $container;
-    private Config $config;
-    private User $user;
-    private AdminNotificationManager $adminNotificationManager;
-    private SystemRequirements $systemRequirements;
-    private ScheduledJob $scheduledJob;
-    private DataManager $dataManager;
-
     public function __construct(
-        Container $container,
-        Config $config,
-        User $user,
-        AdminNotificationManager $adminNotificationManager,
-        SystemRequirements $systemRequirements,
-        ScheduledJob $scheduledJob,
-        DataManager $dataManager
+        private Container $container,
+        private Config $config,
+        private User $user,
+        private AdminNotificationManager $adminNotificationManager,
+        private SystemRequirements $systemRequirements,
+        private ScheduledJob $scheduledJob,
+        private DataManager $dataManager
     ) {
-        $this->container = $container;
-        $this->config = $config;
-        $this->user = $user;
-        $this->adminNotificationManager = $adminNotificationManager;
-        $this->systemRequirements = $systemRequirements;
-        $this->scheduledJob = $scheduledJob;
-        $this->dataManager = $dataManager;
 
         if (!$this->user->isAdmin()) {
             throw new Forbidden();
@@ -98,7 +83,7 @@ class Admin
 
 
     /**
-     * @param array<string,mixed> $params
+     * @param array<string, mixed> $params
      * @param string $data
      * @return array{
      *   id: string,
@@ -160,7 +145,7 @@ class Admin
     }
 
     /**
-     * @return array<int,array{id:string,type:string,message:string}>
+     * @return array<int, array{id: string, type: string, message: string}>
      */
     public function actionAdminNotificationList(): array
     {
@@ -169,9 +154,9 @@ class Admin
 
     /**
      * @return array{
-     *   php: array<string,array<string,mixed>>,
-     *   database: array<string,array<string,mixed>>,
-     *   permission: array<string,array<string,mixed>>,
+     *   php: array<string, array<string, mixed>>,
+     *   database: array<string, array<string, mixed>>,
+     *   permission: array<string, array<string, mixed>>,
      * }
      */
     public function actionSystemRequirementList(): array

application/Espo/Controllers/Attachment.php

@@ -29,17 +29,11 @@
 
 namespace Espo\Controllers;
 
-use Espo\Core\Exceptions\Error;
-use Espo\Core\Exceptions\NotFound;
 use Espo\Core\Api\Request;
 use Espo\Core\Api\Response;
 use Espo\Core\Controllers\RecordBase;
-use Espo\Core\Exceptions\BadRequest;
 use Espo\Core\Exceptions\Forbidden;
-use Espo\Tools\Attachment\FieldData;
-use Espo\Tools\Attachment\Service;
-use Espo\Tools\Attachment\UploadUrlService;
-use Espo\Tools\Attachment\UploadService;
+
 use stdClass;
 
 class Attachment extends RecordBase
@@ -52,125 +46,4 @@ class Attachment extends RecordBase
 
         return parent::getActionList($request, $response);
     }
-
-    /**
-     * @throws BadRequest
-     * @throws Forbidden
-     * @throws Error
-     */
-    public function postActionGetAttachmentFromImageUrl(Request $request): stdClass
-    {
-        $data = $request->getParsedBody();
-
-        $url = $data->url ?? null;
-        $field = $data->field ?? null;
-        $parentType = $data->parentType ?? null;
-        $relatedType = $data->relatedType ?? null;
-
-        if (!$url || !$field) {
-            throw new BadRequest("No `url` or `field`.");
-        }
-
-        try {
-            $fieldData = new FieldData(
-                $field,
-                $parentType,
-                $relatedType
-            );
-        }
-        catch (Error $e) {
-            throw new BadRequest($e->getMessage());
-        }
-
-        return $this->injectableFactory
-            ->create(UploadUrlService::class)
-            ->uploadImage($url, $fieldData)
-            ->getValueMap();
-    }
-
-    /**
-     * @throws BadRequest
-     * @throws Forbidden
-     * @throws NotFound
-     */
-    public function postActionGetCopiedAttachment(Request $request): stdClass
-    {
-        $data = $request->getParsedBody();
-
-        $id = $data->id ?? null;
-        $field = $data->field ?? null;
-        $parentType = $data->parentType ?? null;
-        $relatedType = $data->relatedType ?? null;
-
-        if (!$id || !$field) {
-            throw new BadRequest("No `id` or `field`.");
-        }
-
-        try {
-            $fieldData = new FieldData(
-                $field,
-                $parentType,
-                $relatedType
-            );
-        }
-        catch (Error $e) {
-            throw new BadRequest($e->getMessage());
-        }
-
-        return $this->getAttachmentService()
-            ->copy($id, $fieldData)
-            ->getValueMap();
-    }
-
-    /**
-     * @throws BadRequest
-     * @throws Forbidden
-     * @throws NotFound
-     */
-    public function getActionFile(Request $request, Response $response): void
-    {
-        $id = $request->getRouteParam('id');
-
-        if (!$id) {
-            throw new BadRequest();
-        }
-
-        $fileData = $this->getAttachmentService()->getFileData($id);
-
-        if ($fileData->getType()) {
-            $response->setHeader('Content-Type', $fileData->getType());
-        }
-
-        $response
-            ->setHeader('Content-Disposition', 'attachment; filename="' . $fileData->getName() . '"')
-            ->setHeader('Content-Length', (string) $fileData->getSize())
-            ->setBody($fileData->getStream());
-    }
-
-    /**
-     * @throws BadRequest
-     * @throws Forbidden
-     * @throws Error
-     * @throws NotFound
-     */
-    public function postActionChunk(Request $request, Response $response): void
-    {
-        $id = $request->getRouteParam('id');
-        $body = $request->getBodyContents();
-
-        if (!$id || !$body) {
-            throw new BadRequest();
-        }
-
-        $this->injectableFactory
-            ->create(UploadService::class)
-            ->uploadChunk($id, $body);
-
-        $response->writeBody('true');
-    }
-
-    private function getAttachmentService(): Service
-    {
-        return $this->injectableFactory->create(Service::class);
-    }
 }

application/Espo/Controllers/AuthenticationProvider.php

@@ -0,0 +1,44 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 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\Controllers;
+
+use Espo\Core\Controllers\RecordBase;
+
+class AuthenticationProvider extends RecordBase
+{
+    protected function checkAccess(): bool
+    {
+        if (!$this->user->isAdmin()) {
+            return false;
+        }
+
+        return true;
+    }
+}

application/Espo/Controllers/DataPrivacy.php

@@ -32,26 +32,17 @@ namespace Espo\Controllers;
 use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\Exceptions\BadRequest;
 
-use Espo\Core\{
-    Api\Request,
-    Api\Response,
-    Acl,
-};
+use Espo\Core\Acl;
+use Espo\Core\Api\Request;
+use Espo\Core\Api\Response;
 
 use Espo\Tools\DataPrivacy\Erasor;
 
 class DataPrivacy
 {
-    private $erasor;
-
-    private $acl;
-
-    public function __construct(Erasor $erasor, Acl $acl)
+    public function __construct(private Erasor $erasor, private Acl $acl)
     {
-        $this->erasor = $erasor;
-        $this->acl = $acl;
-
-        if ($this->acl->get('dataPrivacyPermission') === 'no') {
+        if ($this->acl->getPermissionLevel('dataPrivacyPermission') === Acl\Table::LEVEL_NO) {
             throw new Forbidden();
         }
     }

application/Espo/Controllers/Email.php

@@ -29,356 +29,7 @@
 
 namespace Espo\Controllers;
 
-use Espo\Core\Acl\Table;
-use Espo\Core\Exceptions\BadRequest;
-use Espo\Core\Exceptions\Error;
-use Espo\Core\Exceptions\Forbidden;
-use Espo\Core\Exceptions\NotFound;
-
 use Espo\Core\Controllers\Record;
-use Espo\Core\Api\Request;
-
-use Espo\Core\Mail\SmtpParams;
-use Espo\Entities\Email as EmailEntity;
-use Espo\Tools\Attachment\FieldData;
-use Espo\Tools\Email\SendService;
-use Espo\Tools\Email\InboxService as InboxService;
-
-use Espo\Tools\Email\Service;
-use Espo\Tools\Email\TestSendData;
-use Espo\Tools\EmailTemplate\InsertField\Service as InsertFieldService;
-use stdClass;
 
 class Email extends Record
-{
-    /**
-     * @throws BadRequest
-     * @throws Forbidden
-     * @throws NotFound
-     */
-    public function postActionGetCopiedAttachments(Request $request): stdClass
-    {
-        $data = $request->getParsedBody();
-
-        $id = $data->id ?? null;
-        $field = $data->field ?? null;
-        $parentType = $data->parentType ?? null;
-        $relatedType = $data->relatedType ?? null;
-
-        if (!$id || !$field) {
-            throw new BadRequest("No `id` or `field`.");
-        }
-
-        try {
-            $fieldData = new FieldData(
-                $field,
-                $parentType,
-                $relatedType
-            );
-        }
-        catch (Error $e) {
-            throw new BadRequest($e->getMessage());
-        }
-
-        $list = $this->injectableFactory
-            ->create(Service::class)
-            ->copyAttachments($id, $fieldData);
-
-        $ids = array_map(
-            fn ($item) => $item->getId(),
-            $list
-        );
-
-        $names = (object) [];
-
-        foreach ($list as $item) {
-            $names->{$item->getId()} = $item->getName();
-        }
-
-        return (object) [
-            'ids' => $ids,
-            'names' => $names,
-        ];
-    }
-
-    /**
-     * @throws Forbidden
-     * @throws NotFound
-     * @throws Error
-     * @throws BadRequest
-     */
-    public function postActionSendTestEmail(Request $request): bool
-    {
-        if (!$this->acl->checkScope(EmailEntity::ENTITY_TYPE)) {
-            throw new Forbidden();
-        }
-
-        $data = $request->getParsedBody();
-
-        $type = $data->type ?? null;
-        $id = $data->id ?? null;
-        $server = $data->server ?? null;
-        $port = $data->port ?? null;
-        $username = $data->username ?? null;
-        $password = $data->password ?? null;
-        $auth = $data->auth ?? null;
-        $authMechanism = $data->authMechanism ?? null;
-        $security = $data->security ?? null;
-        $userId = $data->userId ?? null;
-        $fromAddress = $data->fromAddress ?? null;
-        $fromName = $data->fromName ?? null;
-        $emailAddress = $data->emailAddress ?? null;
-
-        if (!is_string($server)) {
-            throw new BadRequest("`server`");
-        }
-
-
-        if (!is_int($port)) {
-            throw new BadRequest("`port`.");
-        }
-
-        if (!is_string($emailAddress)) {
-            throw new BadRequest("`emailAddress`.");
-        }
-
-        $smtpParams = SmtpParams
-            ::create($server, $port)
-            ->withSecurity($security)
-            ->withFromName($fromName)
-            ->withFromAddress($fromAddress)
-            ->withAuth($auth);
-
-        if ($auth) {
-            $smtpParams = $smtpParams
-                ->withUsername($username)
-                ->withPassword($password)
-                ->withAuthMechanism($authMechanism);
-        }
-
-        $data = new TestSendData($emailAddress, $type, $id, $userId);
-
-        $this->getSendService()->sendTestEmail($smtpParams, $data);
-
-        return true;
-    }
-
-    /**
-     * @throws BadRequest
-     */
-    public function postActionMarkAsRead(Request $request): bool
-    {
-        $data = $request->getParsedBody();
-
-        if (!empty($data->ids)) {
-            $idList = $data->ids;
-        }
-        else {
-            if (!empty($data->id)) {
-                $idList = [$data->id];
-            }
-            else {
-                throw new BadRequest();
-            }
-        }
-
-        $this->getInboxService()->markAsReadIdList($idList);
-
-        return true;
-    }
-
-    /**
-     * @throws BadRequest
-     */
-    public function postActionMarkAsNotRead(Request $request): bool
-    {
-        $data = $request->getParsedBody();
-
-        if (!empty($data->ids)) {
-            $idList = $data->ids;
-        }
-        else {
-            if (!empty($data->id)) {
-                $idList = [$data->id];
-            }
-            else {
-                throw new BadRequest();
-            }
-        }
-
-        $this->getInboxService()->markAsNotReadIdList($idList);
-
-        return true;
-    }
-
-    public function postActionMarkAllAsRead(): bool
-    {
-        $this->getInboxService()->markAllAsRead();
-
-        return true;
-    }
-
-    /**
-     * @throws BadRequest
-     */
-    public function postActionMarkAsImportant(Request $request): bool
-    {
-        $data = $request->getParsedBody();
-
-        if (!empty($data->ids)) {
-            $idList = $data->ids;
-        }
-        else {
-            if (!empty($data->id)) {
-                $idList = [$data->id];
-            }
-            else {
-                throw new BadRequest();
-            }
-        }
-
-        $this->getInboxService()->markAsImportantIdList($idList);
-
-        return true;
-    }
-
-    /**
-     * @throws BadRequest
-     */
-    public function postActionMarkAsNotImportant(Request $request): bool
-    {
-        $data = $request->getParsedBody();
-
-        if (!empty($data->ids)) {
-            $idList = $data->ids;
-        }
-        else {
-            if (!empty($data->id)) {
-                $idList = [$data->id];
-            }
-            else {
-                throw new BadRequest();
-            }
-        }
-
-        $this->getInboxService()->markAsNotImportantIdList($idList);
-
-        return true;
-    }
-
-    /**
-     * @throws BadRequest
-     */
-    public function postActionMoveToTrash(Request $request): bool
-    {
-        $data = $request->getParsedBody();
-
-        if (!empty($data->ids)) {
-            $idList = $data->ids;
-        }
-        else {
-            if (!empty($data->id)) {
-                $idList = [$data->id];
-            }
-            else {
-                throw new BadRequest();
-            }
-        }
-
-        $this->getInboxService()->moveToTrashIdList($idList);
-
-        return true;
-    }
-
-    /**
-     * @throws BadRequest
-     */
-    public function postActionRetrieveFromTrash(Request $request): bool
-    {
-        $data = $request->getParsedBody();
-
-        if (!empty($data->ids)) {
-            $idList = $data->ids;
-        }
-        else {
-            if (!empty($data->id)) {
-                $idList = [$data->id];
-            }
-            else {
-                throw new BadRequest();
-            }
-        }
-
-        $this->getInboxService()->retrieveFromTrashIdList($idList);
-
-        return true;
-    }
-
-    public function getActionGetFoldersNotReadCounts(): stdClass
-    {
-        return (object) $this->getInboxService()->getFoldersNotReadCounts();
-    }
-
-    /**
-     * @throws BadRequest
-     * @throws Forbidden
-     * @throws NotFound
-     */
-    public function postActionMoveToFolder(Request $request): bool
-    {
-        $data = $request->getParsedBody();
-
-        if (!empty($data->ids)) {
-            $idList = $data->ids;
-        }
-        else if (!empty($data->id)) {
-            $idList = [$data->id];
-        }
-        else {
-            throw new BadRequest();
-        }
-
-        if (empty($data->folderId)) {
-            throw new BadRequest();
-        }
-
-        if (count($idList) === 1) {
-            $this->getInboxService()->moveToFolder($idList[0], $data->folderId);
-
-            return true;
-
-        }
-
-        $this->getInboxService()->moveToFolderIdList($idList, $data->folderId);
-
-        return true;
-    }
-
-    /**
-     * @throws Forbidden
-     */
-    public function getActionGetInsertFieldData(Request $request): stdClass
-    {
-        if (!$this->acl->checkScope(EmailEntity::ENTITY_TYPE, Table::ACTION_CREATE)) {
-            throw new Forbidden();
-        }
-
-        return $this->injectableFactory
-            ->create(InsertFieldService::class)
-            ->getData(
-                $request->getQueryParam('parentType'),
-                $request->getQueryParam('parentId'),
-                $request->getQueryParam('to')
-            );
-    }
-
-    private function getInboxService(): InboxService
-    {
-        return $this->injectableFactory->create(InboxService::class);
-    }
-
-    private function getSendService(): SendService
-    {
-        return $this->injectableFactory->create(SendService::class);
-    }
-}
+{}

application/Espo/Controllers/EmailAddress.php

@@ -29,52 +29,7 @@
 
 namespace Espo\Controllers;
 
-use Espo\Core\Exceptions\Forbidden;
-use Espo\Core\Exceptions\BadRequest;
-
-use Espo\Tools\Email\AddressService as Service;
-
-use Espo\Core\Api\Request;
 use Espo\Core\Controllers\RecordBase;
 
 class EmailAddress extends RecordBase
-{
-    private const ADDRESS_MAX_SIZE = 50;
-
-    /**
-     * @return array<int,array<string,mixed>>
-     * @throws Forbidden
-     * @throws BadRequest
-     */
-    public function actionSearchInAddressBook(Request $request): array
-    {
-        if (!$this->acl->checkScope('Email')) {
-            throw new Forbidden();
-        }
-
-        if (!$this->acl->checkScope('Email', 'create')) {
-            throw new Forbidden();
-        }
-
-        $q = $request->getQueryParam('q');
-
-        if ($q === null) {
-            throw new BadRequest("No `q` parameter.");
-        }
-
-        $maxSize = intval($request->getQueryParam('maxSize'));
-
-        if (!$maxSize || $maxSize > self::ADDRESS_MAX_SIZE) {
-            $maxSize = (int) $this->config->get('recordsPerPage');
-        }
-
-        $onlyActual = $request->getQueryParam('onlyActual') === 'true';
-
-        return $this->getEmailAddressService()->searchInAddressBook($q, $maxSize, $onlyActual);
-    }
-
-    private function getEmailAddressService(): Service
-    {
-        return $this->injectableFactory->create(Service::class);
-    }
-}
+{}

application/Espo/Controllers/EmailFilter.php

@@ -31,5 +31,4 @@ namespace Espo\Controllers;
 
 class EmailFilter extends \Espo\Core\Controllers\Record
 {
-
 }

application/Espo/Controllers/EmailTemplate.php

@@ -29,48 +29,7 @@
 
 namespace Espo\Controllers;
 
-use Espo\Core\Exceptions\BadRequest;
-
-use Espo\Core\Exceptions\ForbiddenSilent;
-use Espo\Core\Exceptions\NotFound;
-use Espo\Tools\EmailTemplate\Data;
-use Espo\Tools\EmailTemplate\Service;
-
-use Espo\Core\Api\Request;
 use Espo\Core\Controllers\Record;
 
-use stdClass;
-
 class EmailTemplate extends Record
-{
-    /**
-     * @throws BadRequest
-     * @throws NotFound
-     * @throws ForbiddenSilent
-     */
-    public function actionParse(Request $request): stdClass
-    {
-        $id = $request->getQueryParam('id');
-
-        if ($id === null) {
-            throw new BadRequest("No `id`.");
-        }
-
-        $data = Data::create()
-            ->withRelatedType($request->getQueryParam('relatedType'))
-            ->withRelatedId($request->getQueryParam('relatedId'))
-            ->withParentType($request->getQueryParam('parentType'))
-            ->withParentId($request->getQueryParam('parentId'))
-            ->withEmailAddress($request->getQueryParam('emailAddress'));
-
-        $result = $this->getEmailTemplateService()->process($id, $data);
-
-        return $result->getValueMap();
-
-    }
-
-    private function getEmailTemplateService(): Service
-    {
-        return $this->injectableFactory->create(Service::class);
-    }
-}
+{}

application/Espo/Controllers/EmailTemplateCategory.php

@@ -31,5 +31,4 @@ namespace Espo\Controllers;
 
 class EmailTemplateCategory extends \Espo\Core\Templates\Controllers\CategoryTree
 {
-
 }

application/Espo/Controllers/EntityManager.php

@@ -29,33 +29,35 @@
 
 namespace Espo\Controllers;
 
-use Espo\{
-    Entities\User,
-    Tools\EntityManager\EntityManager as EntityManagerTool,
-};
+use Espo\Core\Exceptions\Conflict;
+use Espo\Core\Exceptions\Error;
+use Espo\Entities\User;
+use Espo\Tools\EntityManager\EntityManager as EntityManagerTool;
 
-use Espo\Core\{
-    Exceptions\Forbidden,
-    Exceptions\BadRequest,
-    Api\Request,
-};
+use Espo\Core\Api\Request;
+use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
 
 class EntityManager
 {
-    private $user;
-
-    private $entityManagerTool;
-
-    public function __construct(User $user, EntityManagerTool $entityManagerTool)
-    {
-        $this->user = $user;
-        $this->entityManagerTool = $entityManagerTool;
+    /**
+     * @throws Forbidden
+     */
+    public function __construct(
+        private User $user,
+        private EntityManagerTool $entityManagerTool
+    ) {
 
         if (!$this->user->isAdmin()) {
             throw new Forbidden();
         }
     }
 
+    /**
+     * @throws BadRequest
+     * @throws Error
+     * @throws Conflict
+     */
     public function postActionCreateEntity(Request $request): bool
     {
         $data = $request->getParsedBody();
@@ -137,6 +139,10 @@ class EntityManager
         return true;
     }
 
+    /**
+     * @throws BadRequest
+     * @throws Error
+     */
     public function postActionUpdateEntity(Request $request): bool
     {
         $data = $request->getParsedBody();
@@ -160,6 +166,11 @@ class EntityManager
         return true;
     }
 
+    /**
+     * @throws BadRequest
+     * @throws Forbidden
+     * @throws Error
+     */
     public function postActionRemoveEntity(Request $request): bool
     {
         $data = $request->getParsedBody();
@@ -183,6 +194,11 @@ class EntityManager
         return true;
     }
 
+    /**
+     * @throws BadRequest
+     * @throws Error
+     * @throws Conflict
+     */
     public function postActionCreateLink(Request $request): bool
     {
         $data = $request->getParsedBody();
@@ -361,6 +377,10 @@ class EntityManager
         return true;
     }
 
+    /**
+     * @throws BadRequest
+     * @throws Error
+     */
     public function postActionFormula(Request $request): bool
     {
         $data = $request->getParsedBody();

application/Espo/Controllers/Extension.php

@@ -32,12 +32,10 @@ namespace Espo\Controllers;
 use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\Exceptions\BadRequest;
 
-use Espo\Core\{
-    Upgrades\ExtensionManager,
-    Controllers\RecordBase,
-    Api\Request,
-    Api\Response,
-};
+use Espo\Core\Api\Request;
+use Espo\Core\Api\Response;
+use Espo\Core\Controllers\RecordBase;
+use Espo\Core\Upgrades\ExtensionManager;
 
 use stdClass;
 

application/Espo/Controllers/FieldManager.php

@@ -29,36 +29,25 @@
 
 namespace Espo\Controllers;
 
-use Espo\{
-    Entities\User,
-    Tools\FieldManager\FieldManager as FieldManagerTool,
-};
-
-use Espo\Core\{
-    Exceptions\Conflict,
-    Exceptions\Error,
-    Exceptions\Forbidden,
-    Exceptions\BadRequest,
-    Api\Request,
-    DataManager};
+use Espo\Entities\User;
+use Espo\Tools\FieldManager\FieldManager as FieldManagerTool;
+use Espo\Core\Api\Request;
+use Espo\Core\DataManager;
+use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Conflict;
+use Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Forbidden;
 
 class FieldManager
 {
-    private $user;
-
-    private $dataManager;
-
-    private $fieldManagerTool;
-
     /**
      * @throws Forbidden
      */
-    public function __construct(User $user, DataManager $dataManager, FieldManagerTool $fieldManagerTool)
-    {
-        $this->user = $user;
-        $this->dataManager = $dataManager;
-        $this->fieldManagerTool = $fieldManagerTool;
-
+    public function __construct(
+        private User $user,
+        private DataManager $dataManager,
+        private FieldManagerTool $fieldManagerTool
+    ) {
         $this->checkControllerAccess();
     }
 
@@ -73,7 +62,7 @@ class FieldManager
     }
 
     /**
-     * @return array<string,mixed>
+     * @return array<string, mixed>
      * @throws BadRequest
      * @throws Error
      */
@@ -90,7 +79,7 @@ class FieldManager
     }
 
     /**
-     * @return array<string,mixed>
+     * @return array<string, mixed>
      * @throws BadRequest
      * @throws Conflict
      * @throws Error
@@ -123,7 +112,7 @@ class FieldManager
     }
 
     /**
-     * @return array<string,mixed>
+     * @return array<string, mixed>
      * @throws BadRequest
      * @throws Error
      */
@@ -133,7 +122,7 @@ class FieldManager
     }
 
     /**
-     * @return array<string,mixed>
+     * @return array<string, mixed>
      * @throws BadRequest
      * @throws Error
      */
@@ -176,6 +165,7 @@ class FieldManager
 
         $result = $this->fieldManagerTool->delete($scope, $name);
 
+        $this->dataManager->clearCache();
         $this->dataManager->rebuildMetadata();
 
         return $result;
@@ -189,14 +179,20 @@ class FieldManager
     {
         $data = $request->getParsedBody();
 
-        if (empty($data->scope) || empty($data->name)) {
+        $scope = $data->scope ?? null;
+        $name = $data->name ?? null;
+
+        if (!$scope || !$name) {
             throw new BadRequest();
         }
 
-        $this->fieldManagerTool->resetToDefault($data->scope, $data->name);
+        if (!is_string($scope) || !is_string($name)) {
+            throw new BadRequest();
+        }
 
-        $this->dataManager->clearCache();
-        $this->dataManager->rebuildMetadata();
+        $this->fieldManagerTool->resetToDefault($scope, $name);
+
+        $this->dataManager->rebuild([$scope]);
 
         return true;
     }

application/Espo/Controllers/I18n.php

@@ -43,7 +43,7 @@ class I18n
     }
 
     /**
-     * @return array<string,mixed>
+     * @return array<string, mixed>
      */
     public function getActionRead(Request $request): array
     {