9.1.7

* Remove double semicolons

* fix formatting

* fix formatting 2

.editorconfig

@@ -4,8 +4,7 @@ root = true
 [*]
 indent_style = space
 indent_size = 4
-end_of_line = lf
+end_of_line = crlf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-

.gitattributes

@@ -8,4 +8,9 @@
 *.tpl text eol=crlf
 *.html text eol=crlf
 
+bin/command text eol=lf
+
+.gitattributes text eol=crlf
+.gitignore text eol=crlf
+
 *.png binary

.github/CONTRIBUTING.md

@@ -1,17 +1,40 @@
+## Issues
+
+#### Guidelines
+
+When reporting a possible bug, provide detail steps so that we will be able
+to reproduce the issue. Steps to reproduce should be clear and unambiguous. Try not to use phrases like "very big bug",
+"huge issue", "useless feature", etc. No need to use exclamation marks as well.
+
+#### No support
+
+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).
+
+#### Forum
+
+If you are very new to EspoCRM, it's probable that an issue you ran into is not a bug.
+Consider creating a topic on our [forum](https://forum.espocrm.com/forum/general) instead.
+
+#### Project's best interest
+
+The issue tracker is for the benefit of the EspoCRM project. The project maintainers are going to handle issues in the project's best interest.
+The maintainers have right to close issues without explanation.
+
+#### Off-topic
+
+As we reference GitHub issues in release notes, we strive to keep them free of off-topic comments.
+
 ## 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.
+We are open for contributions that are bug fixes and small improvements. If you would like to contribute something that is not a small fix, please reach out to maintainers before submitting your PR (by creating a GitHub issue).
 
-See [Code Style Guidelines](https://github.com/espocrm/espocrm/wiki/Code-Style-Guidelines).
+Before we can merge your pull request, you need to accept our CLA [here](https://github.com/espocrm/cla).
+
+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).
 
 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.
-
-## 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.
-
-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.
+* *master* – the develop branch; new features should be pushed to here;
+* *fix* – the upcoming maintenance release; small fixes should be pushed to here.

.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. Only for issues related to open source EspoCRM. Issues related to extensions should not to be posted here.
 title: ''
 labels: ''
 assignees: ''
@@ -10,8 +10,8 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+**To Reproduce (MANDATORY, DO NOT REMOVE)**
+Explicit steps to reproduce the behavior:
 1. ...
 2. ...
 3. ...

.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: For high-level features, create feature requests on our forum. For low-level (framework) – here on GitHub.
 title: ''
 labels: ''
 assignees: ''

.github/SECURITY.md

@@ -2,8 +2,8 @@
 
 ## 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
 
-For severe vulnerabilities we provide fixes for 2 minor versions (the second number in the version string) back from the current stable version. Separate patches or manual fix guidelines will be provided for more old versions.
+For severe vulnerabilities we provide fixes for 2 minor versions (the second number in the version string) back from the current stable version.

.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-24.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.3']
+        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

.github/workflows/test-integration.yml

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

.github/workflows/test.yml

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

.gitignore

@@ -5,6 +5,8 @@
 /data/.backup/*
 /data/config.php
 /data/config-internal.php
+/data/config-override.php
+/data/config-internal-override.php
 /data/tmp/*
 /build
 /node_modules
@@ -23,3 +25,7 @@
 !/custom/Espo/Custom/.htaccess
 !/custom/Espo/Modules/.htaccess
 /install/config.php
+
+client/css/espo/*
+client/lib/*
+client/modules/crm/lib/*

.htaccess

@@ -24,11 +24,6 @@ Options -Indexes
     # Skip redirect for `client` dir.
     RewriteRule ^client/ - [L]
 
-# {#dev}
-    # Skip redirect for `node_modules` dir. Actual only for dev environment.
-    RewriteRule ^node_modules/ - [L]
-# {/dev}
-
     # Store base path.
     RewriteCond %{REQUEST_URI}::$1 ^(.*?/)(.*)::\2$
     RewriteRule ^(.*)$ - [E=BASE:%1]

.idea/.gitignore

@@ -0,0 +1,7 @@
+*
+!.gitignore
+!/codeStyles
+!/fileTemplates
+!/inspectionProfiles
+!misc.xml
+!jsonSchemas.xml

.idea/codeStyles/Project.xml

@@ -0,0 +1,26 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JSCodeStyleSettings version="0">
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+    </JSCodeStyleSettings>
+    <PHPCodeStyleSettings>
+      <option name="GROUP_USE_WRAP" value="2" />
+      <option name="VARIABLE_NAMING_STYLE" value="CAMEL_CASE" />
+      <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" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="ALIGN_MULTILINE_FOR" value="false" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/fileTemplates/includes/PHP File Header.php

@@ -0,0 +1,27 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-${YEAR} Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/

.idea/fileTemplates/internal/JavaScript File.js

@@ -0,0 +1 @@
+#parse("PHP File Header.php")

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,23 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6ConvertLetToConst" enabled="true" level="WEAK WARNING" enabled_by_default="true" editorAttributes="INFO_ATTRIBUTES" />
+    <inspection_tool class="HtmlUnknownAnchorTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSIgnoredPromiseFromCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpDocMissingThrowsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpDocSignatureIsNotCompleteInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpMissingFieldTypeInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpMissingParamTypeInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpMissingReturnTypeInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpPropertyCanBeReadonlyInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpStanGlobal" enabled="false" level="WEAK WARNING" enabled_by_default="false">
+      <option name="config" value="$PROJECT_DIR$/phpstan.neon" />
+    </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>

.idea/misc.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpEntryPointsManager">
+    <pattern value="\Espo\Controllers\*" member="*Action*" />
+    <pattern value="\Espo\Modules\*\Controllers\*" member="*Action*" />
+    <suppressed_annotations>@implements</suppressed_annotations>
+  </component>
+</project>

.npmrc

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

.vscode/.gitignore

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

.vscode/settings.json

@@ -0,0 +1,488 @@
+{
+    "json.schemas": [
+        {
+            "fileMatch": [
+                "*/Resources/autoload.json"
+            ],
+            "url": "./schema/autoload.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/routes.json"
+            ],
+            "url": "./schema/routes.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/module.json"
+            ],
+            "url": "./schema/module.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/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/logicDefs/*.json"
+            ],
+            "url": "./schema/metadata/logicDefs.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/clientIcons.json"
+            ],
+            "url": "./schema/metadata/app/clientIcons.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/clientRecord.json"
+            ],
+            "url": "./schema/metadata/app/clientRecord.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/emailTemplate.json"
+            ],
+            "url": "./schema/metadata/app/emailTemplate.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/entityTemplates.json"
+            ],
+            "url": "./schema/metadata/app/entityTemplates.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/layouts.json"
+            ],
+            "url": "./schema/metadata/app/layouts.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/linkManager.json"
+            ],
+            "url": "./schema/metadata/app/linkManager.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/entityManager.json"
+            ],
+            "url": "./schema/metadata/app/entityManager.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/mapProviders.json"
+            ],
+            "url": "./schema/metadata/app/mapProviders.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/clientNavbar.json"
+            ],
+            "url": "./schema/metadata/app/clientNavbar.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/reactions.json"
+            ],
+            "url": "./schema/metadata/app/reactions.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/rebuild.json"
+            ],
+            "url": "./schema/metadata/app/rebuild.json"
+        },
+        {
+            "fileMatch": [
+                "*/Resources/metadata/app/record.json"
+            ],
+            "url": "./schema/metadata/app/record.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

@@ -1,68 +1,97 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 /**
-* * `grunt` - full build
-* * `grunt dev` - build only items needed for development (takes less time)
-* * `grunt offline` - build but skip *composer install*
-* * `grant release` - full build plus upgrade packages`
-* * `grant test` - build for tests running
-* * `grant run-tests` - build and run unit and integration tests
+* * `grunt` - full build;
+* * `grunt dev` - build for development;
+* * `grunt offline` - build but skip *composer install*;
+* * `grunt internal` - build only libs and css;
+* * `grunt release` - full build zipped with upgrade packages`;
+* * `grunt test` - build for tests running;
+* * `grunt run-tests` - build and run unit and integration tests.
 */
 
 const fs = require('fs');
 const cp = require('child_process');
 const path = require('path');
+const buildUtils = require('./js/build-utils');
+const {TemplateBundler, Bundler} = require('espo-frontend-build-tools');
+const LayoutTypeBundler = require('./js/layout-template-bundler');
+
+const bundleConfig = require('./frontend/bundle-config.json');
+const libs = require('./frontend/libs.json');
 
 module.exports = grunt => {
 
     const pkg = grunt.file.readJSON('package.json');
-    const bundleConfig = require('./frontend/bundle-config.json');
 
-    let jsFilesToBundle = getBundleLibList().concat(bundleConfig.jsFiles);
-    let jsFilesToCopy = getCopyLibDataList();
+    const originalLibDir = 'client/lib/original';
 
-    let libFilesToMinify = jsFilesToCopy
+    const libsBundleFileList = [
+        'client/src/namespace.js',
+        'client/src/loader.js',
+        ...buildUtils.getPreparedBundleLibList(libs),
+    ];
+
+    const bundleFileMap = {'client/lib/espo.js': libsBundleFileList};
+
+    for (const name in bundleConfig.chunks) {
+        const namePart = 'espo-' + name;
+
+        bundleFileMap[`client/lib/${namePart}.js`] = originalLibDir + `/${namePart}.js`
+    }
+
+    const copyJsFileList = buildUtils.getCopyLibDataList(libs);
+
+    const minifyLibFileList = copyJsFileList
         .filter(item => item.minify)
-        .reduce((map, item) => (
-            map[item.dest] = item.dest,
-            map
-        ), {});
+        .map(item => {
+            return {
+                dest: item.dest,
+                src: item.originalDest,
+            };
+        });
 
-    let currentPath = path.dirname(fs.realpathSync(__filename));
+    const currentPath = path.dirname(fs.realpathSync(__filename));
 
-    let themeList = [];
+    const themeList = [];
 
     fs.readdirSync('application/Espo/Resources/metadata/themes').forEach(file => {
-        themeList.push(file.substr(0, file.length - 5));
+        themeList.push(file.substring(0, file.length - 5));
     });
 
-    let cssminFilesData = {};
-
-    let lessData = {};
+    const cssminFilesData = {};
+    const lessData = {};
 
     themeList.forEach(theme => {
-        let name = camelCaseToHyphen(theme);
+        const name = buildUtils.camelCaseToHyphen(theme);
 
-        let files = {};
+        const files = {};
 
         files['client/css/espo/'+name+'.css'] = 'frontend/less/'+name+'/main.less';
         files['client/css/espo/'+name+'-iframe.css'] = 'frontend/less/'+name+'/iframe/main.less';
@@ -70,23 +99,53 @@ module.exports = grunt => {
         cssminFilesData['client/css/espo/'+name+'.css'] = 'client/css/espo/'+name+'.css';
         cssminFilesData['client/css/espo/'+name+'-iframe.css'] = 'client/css/espo/'+name+'-iframe.css';
 
-        let o = {
+        lessData[theme] = {
             options: {
                 yuicompress: true,
             },
             files: files,
         };
-
-        lessData[theme] = o;
     });
 
+    const cleanupBeforeFinal = [
+        'build/tmp/custom/Espo/Custom/*',
+        '!build/tmp/custom/Espo/Custom/.htaccess',
+        '!build/tmp/custom/Espo/Modules',
+        'build/tmp/custom/Espo/Modules/*',
+        '!build/tmp/custom/Espo/Modules/.htaccess',
+        'build/tmp/install/config.php',
+        'build/tmp/vendor/*/*/.git',
+        'build/tmp/client/custom/*',
+        '!build/tmp/client/custom/modules',
+        'build/tmp/client/custom/modules/*',
+        '!build/tmp/client/custom/modules/dummy.txt',
+        'build/tmp/client/modules/crm/src',
+        'build/tmp/client/lib/original/*',
+        'build/tmp/client/modules/crm/lib/original',
+        '!build/tmp/client/lib/original/espo.js',
+        '!build/tmp/client/lib/original/espo-*.js',
+        '!build/tmp/client/lib/original/espo-funnel-chart.js',
+        'build/tmp/client/lib/transpiled',
+    ];
+
+    const cleanupBeforeFinalTest = cleanupBeforeFinal.filter(it => {
+        return ![
+            '!build/tmp/custom/Espo/Modules',
+            'build/tmp/custom/Espo/Modules/*',
+            '!build/tmp/custom/Espo/Modules/.htaccess',
+            '!build/tmp/client/custom/modules',
+            'build/tmp/client/custom/modules/*',
+            '!build/tmp/client/custom/modules/dummy.txt',
+        ].includes(it)
+    })
+
     grunt.initConfig({
         pkg: pkg,
 
         mkdir: {
             tmp: {
                 options: {
-                    mode: 0755,
+                    mode: 0o755,
                     create: [
                         'build/tmp',
                     ],
@@ -95,23 +154,19 @@ module.exports = grunt => {
         },
 
         clean: {
-            start: ['build/EspoCRM-*'],
+            transpiled: [
+                'client/lib/transpiled/**',
+            ],
+            start: [
+                'build/EspoCRM-*',
+                'client/lib/*',
+                'client/modules/crm/lib/*',
+                'client/css/espo/*',
+            ],
             final: ['build/tmp'],
             release: ['build/EspoCRM-' + pkg.version],
-            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/*',
-                    'build/tmp/client/custom/*',
-                    '!build/tmp/client/custom/modules',
-                    'build/tmp/client/custom/modules/*',
-                ]
-            }
+            beforeFinal: {src: cleanupBeforeFinal},
+            beforeFinalTest: {src: cleanupBeforeFinalTest},
         },
 
         less: lessData,
@@ -124,22 +179,26 @@ module.exports = grunt => {
 
         uglify: {
             options: {
-                mangle: true,
                 sourceMap: true,
                 output: {
                     comments: /^!/,
                 },
+                beautify: false,
+                compress: {
+                    sequences: false,
+                    collapse_vars: false,
+                    keep_fargs: true,
+                    webkit: true,
+                },
             },
             bundle: {
                 options: {
                     banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
                 },
-                files: {
-                    'build/tmp/client/espo.min.js': jsFilesToBundle,
-                },
+                files: bundleFileMap,
             },
             lib: {
-                files: libFilesToMinify,
+                files: minifyLibFileList,
             },
         },
 
@@ -147,31 +206,23 @@ module.exports = grunt => {
             options: {
                 mode: true,
             },
-            frontendFolders: {
+            frontend: {
                 expand: true,
                 cwd: 'client',
                 src: [
-                    'src/**',
                     'res/**',
                     'fonts/**',
-                    'cfg/**',
                     'modules/**',
                     'img/**',
                     'css/**',
                     'sounds/**',
                     'custom/**',
+                    'lib/**',
                 ],
                 dest: 'build/tmp/client',
             },
             frontendLib: {
-                files: jsFilesToCopy,
-            },
-            frontendCommitedLib: {
-                expand: true,
-                dot: true,
-                cwd: 'client/lib',
-                src: '**',
-                dest: 'build/tmp/client/lib/',
+                files: copyJsFileList,
             },
             backend: {
                 expand: true,
@@ -211,60 +262,6 @@ module.exports = grunt => {
             },
         },
 
-        chmod: {
-            php: {
-                options: {
-                    mode: '644'
-                },
-                src: [
-                    'build/EspoCRM-<%= pkg.version %>/**/*.php',
-                    'build/EspoCRM-<%= pkg.version %>/**/*.json',
-                    'build/EspoCRM-<%= pkg.version %>/**/*.config',
-                    'build/EspoCRM-<%= pkg.version %>/**/.htaccess',
-                    'build/EspoCRM-<%= pkg.version %>/client/**/*.js',
-                    'build/EspoCRM-<%= pkg.version %>/client/**/*.css',
-                    'build/EspoCRM-<%= pkg.version %>/client/**/*.tpl',
-                    'build/EspoCRM-<%= pkg.version %>/**/*.html',
-                    'build/EspoCRM-<%= pkg.version %>/**/*.txt',
-                ],
-            },
-            folders: {
-                options: {
-                    mode: '755'
-                },
-                src: [
-                    'build/EspoCRM-<%= pkg.version %>/public/install',
-                    'build/EspoCRM-<%= pkg.version %>/public/portal',
-                    'build/EspoCRM-<%= pkg.version %>/public/api',
-                    'build/EspoCRM-<%= pkg.version %>/public/api/v1',
-                    'build/EspoCRM-<%= pkg.version %>/public/api/v1/portal-access',
-                    'build/EspoCRM-<%= pkg.version %>',
-                ],
-            },
-            foldersWritable: {
-                options: {
-                    mode: '775'
-                },
-                src: [
-                    'build/EspoCRM-<%= pkg.version %>/data',
-                    'build/EspoCRM-<%= pkg.version %>/custom',
-                    'build/EspoCRM-<%= pkg.version %>/custom/Espo',
-                    'build/EspoCRM-<%= pkg.version %>/custom/Espo/Custom',
-                    'build/EspoCRM-<%= pkg.version %>/client/custom',
-                    'build/EspoCRM-<%= pkg.version %>/client/modules',
-                    'build/EspoCRM-<%= pkg.version %>/application/Espo/Modules',
-                ]
-            },
-            executable: {
-                options: {
-                    mode: '754'
-                },
-                src: [
-                    'build/EspoCRM-<%= pkg.version %>/bin/*',
-                ],
-            },
-        },
-
         replace: {
             version: {
                 options: {
@@ -286,7 +283,7 @@ module.exports = grunt => {
                 options: {
                     patterns: [
                         {
-                            match: /\# \{\#dev\}(.*)\{\/dev\}/gs,
+                            match: /# \{#dev}(.*)\{\/dev}/gs,
                             replacement: '',
                         }
                     ]
@@ -299,15 +296,156 @@ module.exports = grunt => {
                 ],
             },
         },
+    });
 
+    const writeOriginalLib = (name, contents) => {
+        if (!fs.existsSync(originalLibDir)) {
+            fs.mkdirSync(originalLibDir);
+        }
+
+        const file = originalLibDir + `/${name}.js`;
+
+        fs.writeFileSync(file, contents, 'utf8');
+    };
+
+    grunt.registerTask('bundle', () => {
+        const bundler = new Bundler(bundleConfig, libs);
+
+        const result = bundler.bundle();
+
+        for (const name in result) {
+            let contents = result[name];
+
+            const key = 'espo-' + name;
+
+            if (name === 'main') {
+                contents += '\n' + (new LayoutTypeBundler()).bundle();
+            }
+
+            writeOriginalLib(key, contents);
+        }
+    });
+
+    grunt.registerTask('bundle-templates', () => {
+        const templateBundler = new TemplateBundler({
+            dirs: [
+                'client/res/templates',
+                'client/modules/crm/res/templates',
+            ],
+        });
+
+        templateBundler.process();
+    });
+
+    grunt.registerTask('prepare-lib-original', () => {
+        // Even though `npm ci` runs the same script, 'clean:start' deletes files.
+        cp.execSync("node js/scripts/prepare-lib-original");
+    });
+
+    grunt.registerTask('prepare-lib', () => {
+        cp.execSync("node js/scripts/prepare-lib");
+    });
+
+    grunt.registerTask('transpile', () => {
+        cp.execSync("node js/transpile");
     });
 
     grunt.registerTask('chmod-folders', () => {
         cp.execSync(
-            "find . -type d -exec chmod 755 {} + ",
+            "find . -type d -exec chmod 755 {} +",
+            {cwd: 'build/EspoCRM-' + pkg.version}
+        );
+    });
+
+    grunt.registerTask('chmod-multiple', () => {
+        const dirPath = 'build/EspoCRM-' + pkg.version;
+
+        const fileList = [
             {
-                stdio: 'ignore',
-                cwd: 'build/EspoCRM-' + pkg.version,
+                name: '*.php',
+            },
+            {
+                name: '*.json',
+            },
+            {
+                name: '*.config',
+            },
+            {
+                name: '.htaccess',
+            },
+            {
+                name: '*.html',
+            },
+            {
+                name: '*.txt',
+            },
+            {
+                name: '*.js',
+                folder: 'client',
+            },
+            {
+                name: '*.css',
+                folder: 'client',
+            },
+            {
+                name: '*.tpl',
+                folder: 'client',
+            },
+        ];
+
+        const dirReadableList = [
+            'public/install',
+            'public/portal',
+            'public/api',
+            'public/api/v1',
+            'public/api/v1/portal-access',
+            '.',
+        ];
+
+        const dirWritableList = [
+            'data',
+            'custom',
+            'custom/Espo',
+            'custom/Espo/Custom',
+            'client/custom',
+            'client/modules',
+            'application/Espo/Modules',
+        ];
+
+        fileList.forEach(item => {
+            const path = item.folder || '.';
+            const name = item.name;
+
+            cp.execSync(
+                `find ${path} -type f -iname "${name}" -exec chmod 644 {} +`,
+                {
+                    cwd: dirPath,
+                }
+            );
+        });
+
+        dirReadableList.forEach(item => {
+            cp.execSync(
+                `chmod 755 ${item}`,
+                {
+                    cwd: dirPath,
+                }
+            );
+        });
+
+        dirWritableList.forEach(item => {
+            cp.execSync(
+                `chmod 775 ${item}`,
+                {
+                    cwd: dirPath,
+                }
+            );
+        });
+
+        cp.execSync(
+            `find bin -type f -exec chmod 755 {} +`,
+            {
+                cwd: dirPath,
             }
         );
     });
@@ -321,7 +459,7 @@ module.exports = grunt => {
     });
 
     grunt.registerTask('upgrade', () => {
-        cp.execSync("node diff --all --vendor", {stdio: 'inherit'});
+        cp.execSync("node diff --closest", {stdio: 'inherit'});
     });
 
     grunt.registerTask('unit-tests-run', () => {
@@ -332,26 +470,29 @@ module.exports = grunt => {
         cp.execSync("vendor/bin/phpunit ./tests/integration", {stdio: 'inherit'});
     });
 
-    grunt.registerTask('zip', () => {
+    grunt.registerTask('set-config-params', () => {
+        cp.execSync("composer run-script setConfigParams", {stdio: 'ignore'});
+    });
+
+    grunt.registerTask('zip', function () { // Don't change to arrow-function.
         const archiver = require('archiver');
 
-        let resolve = this.async();
+        const resolve = this.async();
 
-        let folder = 'EspoCRM-' + pkg.version;
-
-        let zipPath = 'build/' + folder +'.zip';
+        const folder = 'EspoCRM-' + pkg.version;
+        const zipPath = 'build/' + folder + '.zip';
 
         if (fs.existsSync(zipPath)) {
             fs.unlinkSync(zipPath);
         }
 
-        let archive = archiver('zip');
+        const archive = archiver('zip');
 
         archive.on('error', err => {
             grunt.fail.warn(err);
         });
 
-        let zipOutput = fs.createWriteStream(zipPath);
+        const zipOutput = fs.createWriteStream(zipPath);
 
         zipOutput.on('close', () => {
             console.log("EspoCRM package has been built.");
@@ -361,48 +502,66 @@ module.exports = grunt => {
 
         archive
             .directory(currentPath + '/build/' + folder, folder)
-            .pipe(zipOutput)
-            .finalize();
+            .pipe(zipOutput);
+
+        archive.finalize();
     });
 
     grunt.registerTask('npm-install', () => {
-        cp.execSync("npm install", {stdio: 'ignore'});
+        cp.execSync("npm ci", {stdio: 'ignore'});
     });
 
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-mkdir');
     grunt.loadNpmTasks('grunt-contrib-less');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
-    grunt.loadNpmTasks('grunt-contrib-uglify-es');
+    grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-replace');
-    grunt.loadNpmTasks('grunt-chmod');
 
-    grunt.registerTask('offline', [
-        'clean:start',
-        'mkdir:tmp',
+    grunt.registerTask('internal', [
         'less',
         'cssmin',
+        'prepare-lib-original',
+        'clean:transpiled',
+        'transpile',
+        'bundle',
+        'bundle-templates',
         'uglify:bundle',
-        'copy:frontendFolders',
         'copy:frontendLib',
-        'copy:frontendCommitedLib',
-        'copy:backend',
+        'prepare-lib',
         'uglify:lib',
+    ]);
+
+    const offline = [
+        'clean:start',
+        'mkdir:tmp',
+        'internal',
+        'copy:frontend',
+        'copy:backend',
         'replace',
         'clean:beforeFinal',
         'copy:final',
         'chmod-folders',
-        'chmod:php',
-        'chmod:folders',
-        'chmod:foldersWritable',
-        'chmod:executable',
+        'chmod-multiple',
         'clean:final',
-    ]);
+    ];
+
+    const offlineTest = offline.map(it => {
+        if (it === 'clean:beforeFinal') {
+            return 'clean:beforeFinalTest'
+        }
+
+        return it;
+    })
+
+    grunt.registerTask('offline', offline);
+    grunt.registerTask('offline-test', offlineTest);
 
     grunt.registerTask('build', [
         'composer-install',
         'npm-install',
+        'set-config-params',
         'offline',
     ]);
 
@@ -435,86 +594,13 @@ module.exports = grunt => {
 
     grunt.registerTask('dev', [
         'composer-install-dev',
-        'less',
+        'npm-install',
+        'internal',
     ]);
 
     grunt.registerTask('test', [
         'composer-install-dev',
         'npm-install',
-        'offline',
+        'offline-test',
     ]);
 };
-
-function getBundleLibList() {
-    const libs = require('./frontend/libs.json');
-
-    let list = [];
-
-    libs.forEach(item => {
-        if (!item.bundle) {
-            return;
-        }
-
-        if (item.files) {
-            item.files.forEach(item  => {
-                list.push(item.src);
-            });
-
-            return;
-        }
-
-        if (!item.src) {
-            throw new Error("No lib src.");
-        }
-
-        list.push(item.src);
-    });
-
-    return list;
-}
-
-function getCopyLibDataList() {
-    const libs = require('./frontend/libs.json');
-
-    let list = [];
-
-    libs.forEach(item => {
-        if (item.bundle) {
-            return;
-        }
-
-        let minify = item.minify;
-
-        if (item.files) {
-            item.files.forEach(item  => {
-                list.push({
-                    src: item.src,
-                    dest: 'build/tmp/' + (item.dest || 'client/lib/' + item.src.split('/').pop()),
-                    minify: minify,
-                });
-            });
-
-            return;
-        }
-
-        if (!item.src) {
-            throw new Error("No lib src.");
-        }
-
-        list.push({
-            src: item.src,
-            dest: 'build/tmp/' + (item.dest || 'client/lib/' + item.src.split('/').pop()),
-            minify: minify,
-        });
-    });
-
-    return list;
-}
-
-function camelCaseToHyphen(string){
-    if (string === null) {
-        return string;
-    }
-
-    return string.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-}

LICENSE.txt

@@ -1,23 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+software for all its users.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+    it under the terms of the GNU Affero General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program 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.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,46 +1,96 @@
 ## EspoCRM
 
-[EspoCRM is an Open Source CRM](https://www.espocrm.com) (Customer Relationship Management) software that allows you to see, enter and evaluate all your company relationships regardless of the type. People, companies or opportunities - all in an easy and intuitive interface.
+[![PHPStan level 8](https://img.shields.io/badge/PHPStan-level%208-brightgreen)](#espocrm)
 
-It's a web application with a frontend designed as a single page application and REST API backend written in PHP.
+[EspoCRM](https://www.espocrm.com) is a free, open-source CRM platform designed to help organizations build and maintain strong customer relationships.
+It provides a wide range of tools to store, organize, and manage leads, contacts, sales opportunities, marketing campaigns,
+support cases, and more – all business information in a simple and intuitive interface.
 
-[Download](https://www.espocrm.com/download/) the latest release from our website.
+![Screenshot](https://user-images.githubusercontent.com/1006792/226094559-995dfd2a-a18f-4619-a21b-79a4e671990a.png)
+
+### Architecture
+
+EspoCRM is a web application with a frontend designed as a single-page application and a REST API
+backend written in PHP.
+
+### Demo
+
+You can try the CRM on an online [demo](https://www.espocrm.com/demo/).
 
 ### Requirements
 
-* PHP 7.3 and later (with pdo, json, gd, openssl, zip, imap, mbstring, curl extensions);
-* MySQL 5.7 (and later), or MariaDB 10.1 (and later).
+* PHP 8.2 - 8.4;
+* MySQL 5.7 (and later), or MariaDB 10.2 (and later);
+* PostgreSQL 15 (and later).
 
-For more information about server configuration see [this article](https://docs.espocrm.com/administration/server-configuration/).
+For more information about server configuration, see [this article](https://docs.espocrm.com/administration/server-configuration/).
+
+### Why EspoCRM?
+
+* **Open-source transparency**. EspoCRM’s source code is open and accessible, so anyone can inspect it and see how data is being managed within the CRM.
+* **Customization freedom**. You can develop features, create custom entities, fields, relationships, buttons to make the CRM fit your specific needs.
+* **Clean user interface**. EspoCRM offers an uncluttered, minimalist, and fast user interface, which is easy to navigate and has a short learning curve.
+* **Straightforward REST API**. It can be easily integrated with other applications using a REST API.
+
+### Who is EspoCRM for?
+
+* **Startups, small & medium-sized businesses**. It’s an affordable solution that is flexible and fully customizable.
+* **Developers & tech enthusiasts**. You can extend functionalities, build extensions, and create custom integrations.
+* **Anyone seeking a free CRM**. If you're looking for a user-friendly and secure CRM platform, it can be a good option.
+
+### Installing stable version
+
+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/)
+
+### Download
+
+[Download](https://www.espocrm.com/download/) the latest release from our website. You can also download the latest and previous release packages from GitHub [releases](https://github.com/espocrm/espocrm/releases).
+
+### Release notes
+
+Release notes are available at GitHub [releases](https://github.com/espocrm/espocrm/releases).
 
 ### Documentation
 
-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.
 
-### How to report a bug
+### Bug reporting
 
-Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our [forum](http://forum.espocrm.com/forum/bug-reports).
-
-### How to install a stable version
-
-[Download](https://www.espocrm.com/download/) the latest version. See the [instructions](https://docs.espocrm.com/administration/installation/) about installation.
+Create a [GitHub issue](https://github.com/espocrm/espocrm/issues/new/choose) or post on our [forum](https://forum.espocrm.com/forum/bug-reports).
 
 ### 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/).
 
-### How to contribute
+We highly recommend using an 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.
 
-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.
+Metadata plays an integral role in the EspoCRM application. All possible parameters are described with a JSON Schema, meaning you will have autocompletion in the IDE. You can also find the full metadata reference in the documentation.
 
-Branches:
+### Community & Support
 
-* *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.
+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).
+EspoCRM is an open-source project licensed under [GNU AGPLv3](https://raw.githubusercontent.com/espocrm/espocrm/master/LICENSE.txt).
+
+### Contributing
+
+Before we can merge your pull request, you need to accept our CLA [here](https://github.com/espocrm/cla). See the [contributing guidelines](https://github.com/espocrm/espocrm/blob/master/.github/CONTRIBUTING.md).
+
+Branches:
+
+* *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/). It may be reasonable to let us know about your intention to join the POEditor project by posting on our forum or via the contact form on our website.
+
+Changes on POEditor are usually merged to the GitHub repository before minor releases.

application/Espo/Binding.php

@@ -0,0 +1,362 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo;
+
+use Espo\Core\Binding\Binder;
+use Espo\Core\Binding\BindingProcessor;
+use Espo\Core\Binding\Key\NamedClassKey;
+
+/**
+ * Default binding for the dependency injection framework. Custom binding should be set up in
+ * `Espo\Modules\{ModuleName}\Binding` or `Espo\Custom\Binding`.
+ *
+ * @link https://docs.espocrm.com/development/di/#binding.
+ */
+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);
+        $this->bindEmailAccount($binder);
+    }
+
+    private function bindServices(Binder $binder): void
+    {
+        $binder->bindService(
+            'Espo\\Core\\InjectableFactory',
+            'injectableFactory'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Container',
+            'container'
+        );
+
+        $binder->bindService(
+            'Psr\\Container\\ContainerInterface',
+            'container'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Module',
+            'module'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Config',
+            'config'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\File\\Manager',
+            'fileManager'
+        );
+
+        $binder->bindService(
+            'Espo\\ORM\\EntityManager',
+            'entityManager'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\ORM\\EntityManager',
+            'entityManager'
+        );
+
+        $binder->bindService(
+            'Espo\\ORM\\Defs',
+            'ormDefs'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\DataManager',
+            'dataManager'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Metadata',
+            'metadata'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Log',
+            'log'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\ApplicationState',
+            'applicationState'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\ApplicationUser',
+            'applicationUser'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Authentication\\AuthToken\\Manager',
+            'authTokenManager'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Select\\SelectBuilderFactory',
+            'selectBuilderFactory'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\ServiceFactory',
+            'serviceFactory'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Record\\ServiceContainer',
+            'recordServiceContainer'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\HookManager',
+            'hookManager'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\NumberUtil',
+            'number'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\DateTime',
+            'dateTime'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\FieldUtil',
+            'fieldUtil'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Mail\\EmailSender',
+            'emailSender'
+        );
+
+        $binder->bindService(
+            NamedClassKey::create('Espo\\Core\\Utils\\Language', 'baseLanguage'),
+            'baseLanguage'
+        );
+
+        $binder->bindService(
+            NamedClassKey::create('Espo\\Core\\Utils\\Language', 'defaultLanguage'),
+            'defaultLanguage'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Language',
+            'language'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Formula\\Manager',
+            'formulaManager'
+        );
+
+        $binder->bindService(
+            NamedClassKey::create('Espo\\Core\\AclManager', 'internalAclManager'),
+            'internalAclManager'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\AclManager',
+            'aclManager'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Acl',
+            'acl'
+        );
+
+        $binder->bindService(
+            'Espo\\Entities\\Preferences',
+            'preferences'
+        );
+
+        $binder->bindService(
+            'Espo\\Entities\\User',
+            'user'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\ClientManager',
+            'clientManager'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\ExternalAccount\\ClientManager',
+            'externalAccountClientManager'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\WebSocket\\Submission',
+            'webSocketSubmission'
+        );
+
+        $binder->bindService(
+            'Espo\\Tools\\Stream\\Service',
+            'streamService'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Config\\SystemConfig',
+            'systemConfig'
+        );
+
+        $binder->bindService(
+            'Espo\\Core\\Utils\\Config\\ApplicationConfig',
+            'applicationConfig'
+        );
+    }
+
+    private function bindCore(Binder $binder): void
+    {
+        $binder->bindImplementation(
+            'Espo\\ORM\\PDO\\PDOProvider',
+            'Espo\\ORM\\PDO\\DefaultPDOProvider'
+        );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Utils\\Database\\ConfigDataProvider',
+            'Espo\\Core\\Utils\\Database\\DefaultConfigDataProvider'
+        );
+    }
+
+    private function bindMisc(Binder $binder): void
+    {
+        $binder->bindImplementation(
+            'Espo\\Core\\Utils\\Id\\RecordIdGenerator',
+            'Espo\\Core\\Utils\\Id\\DefaultRecordIdGenerator'
+        );
+
+        $binder->bindFactory(
+            'Espo\\Core\\Sms\\Sender',
+            'Espo\\Core\\Sms\\SenderFactory'
+        );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Authentication\\Jwt\\KeyFactory',
+            'Espo\\Core\\Authentication\\Jwt\\DefaultKeyFactory'
+        );
+
+        $binder
+            ->for('Espo\\Core\\Authentication\\Oidc\\TokenValidator')
+            ->bindImplementation(
+                'Espo\\Core\\Authentication\\Jwt\\SignatureVerifierFactory',
+                'Espo\\Core\\Authentication\\Oidc\\DefaultSignatureVerifierFactory'
+            );
+
+        $binder
+            ->for('Espo\\Core\\Authentication\\Oidc\\Login')
+            ->bindImplementation(
+                'Espo\\Core\\Authentication\\Oidc\\UserProvider',
+                'Espo\\Core\\Authentication\\Oidc\\UserProvider\\DefaultUserProvider'
+            );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Mail\\Importer\\ParentFinder',
+            'Espo\\Core\\Mail\\Importer\\DefaultParentFinder'
+        );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Mail\\Importer\\DuplicateFinder',
+            'Espo\\Core\\Mail\\Importer\\DefaultDuplicateFinder'
+        );
+
+        $binder->bindImplementation(
+            'Espo\\Tools\\Api\\Cors\\Helper',
+            'Espo\\Tools\\Api\\Cors\\DefaultHelper'
+        );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Record\\ActionHistory\\ActionLogger',
+            'Espo\\Core\\Record\\ActionHistory\\DefaultActionLogger'
+        );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Mail\\Importer',
+            'Espo\\Core\\Mail\\Importer\\DefaultImporter'
+        );
+    }
+
+    private function bindAcl(Binder $binder): void
+    {
+        $binder->bindImplementation(
+            'Espo\\Core\\Acl\\Table\\TableFactory',
+            'Espo\\Core\\Acl\\Table\\DefaultTableFactory'
+        );
+    }
+
+    private function bindWebSocket(Binder $binder): void
+    {
+        $binder->bindFactory(
+            'Espo\\Core\\WebSocket\\Subscriber',
+            'Espo\\Core\\WebSocket\\SubscriberFactory'
+        );
+
+        $binder->bindFactory(
+            'Espo\\Core\\WebSocket\\Sender',
+            'Espo\\Core\\WebSocket\\SenderFactory'
+        );
+    }
+
+    private function bindEmailAccount(Binder $binder): void
+    {
+        $binder
+            ->for('Espo\\Core\\Mail\\Account\\PersonalAccount\\Service')
+            ->bindFactory(
+                'Espo\\Core\\Mail\\Account\\Fetcher',
+                'Espo\\Core\\Mail\\Account\\PersonalAccount\\FetcherFactory'
+            )
+            ->bindImplementation(
+                'Espo\\Core\\Mail\\Account\\StorageFactory',
+                'Espo\\Core\\Mail\\Account\\PersonalAccount\\StorageFactory'
+            );
+
+        $binder
+            ->for('Espo\\Core\\Mail\\Account\\GroupAccount\\Service')
+            ->bindFactory(
+                'Espo\\Core\\Mail\\Account\\Fetcher',
+                'Espo\\Core\\Mail\\Account\\GroupAccount\\FetcherFactory'
+            )
+            ->bindImplementation(
+                'Espo\\Core\\Mail\\Account\\StorageFactory',
+                'Espo\\Core\\Mail\\Account\\GroupAccount\\StorageFactory'
+            );
+    }
+}

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

@@ -2,41 +2,41 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\ActionHistoryRecord;
 
+use Espo\Entities\ActionHistoryRecord;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<ActionHistoryRecord>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

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

@@ -2,89 +2,83 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Attachment;
 
-use Espo\Entities\{
-    User,
-    Note,
-};
-
+use Espo\Core\Name\Field;
+use Espo\Entities\Attachment;
+use Espo\Entities\Note;
+use Espo\Entities\Settings;
+use Espo\Entities\User;
 use Espo\ORM\Entity;
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\AclManager;
+use Espo\Core\ORM\EntityManager;
 
-use Espo\Core\{
-    ORM\EntityManager,
-    AclManager,
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-};
-
+/**
+ * @implements AccessEntityCREDChecker<Attachment>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $aclManager;
-
-    private $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
     {
-        if ($entity->get('parentType') === 'Settings') {
+        if ($entity->getParentType() === Settings::ENTITY_TYPE) {
+            // Allow the logo.
             return true;
         }
 
         $parent = null;
 
-        $hasParent = false;
+        $parentType = $entity->getParentType();
+        $parentId = $entity->getParent()?->getId();
 
-        if ($entity->get('parentId') && $entity->get('parentType')) {
-            $hasParent = true;
+        $relatedType = $entity->getRelatedType();
+        $relatedId = $entity->getRelated()?->getId();
 
-            $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
-        }
-        else if ($entity->get('relatedId') && $entity->get('relatedType')) {
-            $hasParent = true;
-
-            $parent = $this->entityManager->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
+        if ($parentId && $parentType) {
+            $parent = $this->entityManager->getEntityById($parentType, $parentId);
+        } else if ($relatedId && $relatedType) {
+            $parent = $this->entityManager->getEntityById($relatedType, $relatedId);
         }
 
-        if (!$parent || !$hasParent) {
+        if (!$parent) {
             if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
                 return true;
             }
@@ -92,14 +86,21 @@ class AccessChecker implements AccessEntityCREDChecker
             return false;
         }
 
-        if ($parent->getEntityType() === 'Note') {
+        if ($parent->getEntityType() === Note::ENTITY_TYPE) {
+            /** @var Note $parent */
             $result = $this->checkEntityReadNoteParent($user, $parent);
 
             if ($result !== null) {
                 return $result;
             }
-        }
-        else if ($this->aclManager->checkEntity($user, $parent)) {
+        } else if ($this->aclManager->checkEntity($user, $parent)) {
+            if (
+                $entity->getTargetField() &&
+                !$this->aclManager->checkField($user, $parent->getEntityType(), $entity->getTargetField())
+            ) {
+                return false;
+            }
+
             return true;
         }
 
@@ -114,8 +115,8 @@ class AccessChecker implements AccessEntityCREDChecker
     {
         if ($note->getTargetType() === Note::TARGET_TEAMS) {
             $intersect = array_intersect(
-                $note->getLinkMultipleIdList('teams'),
-                $user->getLinkMultipleIdList('teams')
+                $note->getLinkMultipleIdList(Field::TEAMS),
+                $user->getLinkMultipleIdList(Field::TEAMS)
             );
 
             if (count($intersect)) {
@@ -127,7 +128,7 @@ class AccessChecker implements AccessEntityCREDChecker
 
         if ($note->getTargetType() === Note::TARGET_USERS) {
             $isRelated = $this->entityManager
-                ->getRDBRepository('Note')
+                ->getRDBRepository(Note::ENTITY_TYPE)
                 ->getRelation($note, 'users')
                 ->isRelated($user);
 
@@ -138,11 +139,15 @@ class AccessChecker implements AccessEntityCREDChecker
             return null;
         }
 
+        if ($note->getTargetType() === Note::TARGET_ALL) {
+            return true;
+        }
+
         if (!$note->getParentId() || !$note->getParentType()) {
             return null;
         }
 
-        $parent = $this->entityManager->getEntity($note->getParentType(), $note->getParentId());
+        $parent = $this->entityManager->getEntityById($note->getParentType(), $note->getParentId());
 
         if ($parent && $this->aclManager->checkEntity($user, $parent)) {
             return true;

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

@@ -2,41 +2,41 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Attachment;
 
+use Espo\Entities\Attachment;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<Attachment>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     private const ATTR_CREATED_BY_ID = 'createdById';

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

@@ -2,48 +2,47 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\AuthToken;
 
+use Espo\Entities\AuthToken;
 use Espo\Entities\User;
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
 
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-};
-
+/**
+ * @implements AccessEntityCREDChecker<AuthToken>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
     public function __construct(DefaultAccessChecker $defaultAccessChecker)
     {
         $this->defaultAccessChecker = $defaultAccessChecker;

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

@@ -2,45 +2,46 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Email;
 
+use Espo\Core\Name\Field;
 use Espo\Entities\User;
-
+use Espo\Entities\Email;
 use Espo\ORM\Entity;
+use Espo\Core\Acl\AccessEntityCREDSChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Table;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
 
-use Espo\Core\{
-    Acl\Table,
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDSChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-};
-
+/**
+ * @implements AccessEntityCREDSChecker<Email>
+ */
 class AccessChecker implements AccessEntityCREDSChecker
 {
     use DefaultAccessCheckerDependency;
@@ -52,6 +53,8 @@ class AccessChecker implements AccessEntityCREDSChecker
 
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
     {
+        /** @var Email $entity */
+
         if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
             return true;
         }
@@ -79,6 +82,8 @@ class AccessChecker implements AccessEntityCREDSChecker
 
     public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
     {
+        /** @var Email $entity */
+
         if ($user->isAdmin()) {
             return true;
         }
@@ -96,11 +101,11 @@ class AccessChecker implements AccessEntityCREDSChecker
                 return true;
             }
 
-            $assignedUserIdList = $entity->getLinkMultipleIdList('assignedUsers');
+            $assignedUserIdList = $entity->getLinkMultipleIdList(Field::ASSIGNED_USERS);
 
             if (
                 count($assignedUserIdList) === 1 &&
-                $entity->hasLinkMultipleId('assignedUsers', $user->getId())
+                $entity->hasLinkMultipleId(Field::ASSIGNED_USERS, $user->getId())
             ) {
                 return true;
             }
@@ -120,10 +125,46 @@ class AccessChecker implements AccessEntityCREDSChecker
             return false;
         }
 
-        if ($entity->get('status') !== 'Sent' && $entity->get('status') !== 'Archived') {
+        if (
+            $entity->getStatus() !== Email::STATUS_SENT &&
+            $entity->getStatus() !== Email::STATUS_ARCHIVED
+        ) {
             return true;
         }
 
         return false;
     }
+
+    public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
+    {
+        /** @var Email $entity */
+
+        if (
+            $entity->getStatus() === Email::STATUS_DRAFT &&
+            $entity->getCreatedBy() &&
+            $entity->getCreatedBy()->getId() === $user->getId()
+        ) {
+            return true;
+        }
+
+        return $this->defaultAccessChecker->checkEntityEdit($user, $entity, $data);
+    }
+
+    public function checkEdit(User $user, ScopeData $data): bool
+    {
+        if ($data->getCreate() === Table::LEVEL_YES) {
+            return true;
+        }
+
+        return $this->defaultAccessChecker->checkEdit($user, $data);
+    }
+
+    public function checkDelete(User $user, ScopeData $data): bool
+    {
+        if ($data->getCreate() === Table::LEVEL_YES) {
+            return true;
+        }
+
+        return $this->defaultAccessChecker->checkDelete($user, $data);
+    }
 }

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

@@ -2,50 +2,57 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Email;
 
+use Espo\Core\Acl\AssignmentChecker as AssignmentCheckerInterface;
+use Espo\Entities\Email;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
 
-use Espo\Core\{
-    Acl\DefaultAssignmentChecker,
-};
-
-class AssignmentChecker extends DefaultAssignmentChecker
+/**
+ * @implements AssignmentCheckerInterface<Email>
+ */
+class AssignmentChecker implements AssignmentCheckerInterface
 {
-    protected function isPermittedAssignedUser(User $user, Entity $entity): bool
-    {
-        return true;
-    }
+    public function __construct(
+        private AssignmentCheckerInterface\Helper $helper,
+    ) {}
 
-    protected function isPermittedAssignedUsers(User $user, Entity $entity): bool
+    public function check(User $user, Entity $entity): bool
     {
+        if ($entity->getAssignedUser() && !$this->helper->checkAssignedUser($user, $entity)) {
+            return false;
+        }
+
+        if ($entity->getTeams()->getIdList() !== [] && !$this->helper->checkTeams($user, $entity)) {
+            return false;
+        }
+
         return true;
     }
 }

application/Espo/Classes/Acl/Email/LinkCheckers/ParentLinkChecker.php

@@ -0,0 +1,72 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Acl\Email\LinkCheckers;
+
+use Espo\Core\Acl\LinkChecker;
+use Espo\Core\AclManager;
+use Espo\Entities\Email;
+use Espo\Entities\User;
+use Espo\ORM\Entity;
+
+/**
+ * @implements LinkChecker<Email, Entity>
+ * @noinspection PhpUnused
+ */
+class ParentLinkChecker implements LinkChecker
+{
+    public function __construct(
+        private AclManager $aclManager
+    ) {}
+
+    public function check(User $user, Entity $entity, Entity $foreignEntity): bool
+    {
+        if ($this->aclManager->checkEntityRead($user, $foreignEntity)) {
+            return true;
+        }
+
+        $replied = $entity->getReplied();
+
+        if (!$replied) {
+            return false;
+        }
+
+        $parent = $replied->getParent();
+
+        if (
+            !$parent ||
+            $parent->getId() !== $foreignEntity->getId() ||
+            $parent->getEntityType() !== $foreignEntity->getEntityType()
+        ) {
+            return false;
+        }
+
+        return $this->aclManager->checkEntityRead($user, $replied);
+    }
+}

application/Espo/Classes/Acl/Email/LinkCheckers/TeamsLinkChecker.php

@@ -0,0 +1,67 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Acl\Email\LinkCheckers;
+
+use Espo\Core\Acl\LinkChecker;
+use Espo\Core\AclManager;
+use Espo\Entities\Email;
+use Espo\Entities\Team;
+use Espo\Entities\User;
+use Espo\ORM\Entity;
+
+/**
+ * @implements LinkChecker<Email, Team>
+ * @noinspection PhpUnused
+ */
+class TeamsLinkChecker implements LinkChecker
+{
+    public function __construct(
+        private AclManager $aclManager
+    ) {}
+
+    public function check(User $user, Entity $entity, Entity $foreignEntity): bool
+    {
+        if ($this->aclManager->checkEntityRead($user, $foreignEntity)) {
+            return true;
+        }
+
+        $replied = $entity->getReplied();
+
+        if (!$replied) {
+            return false;
+        }
+
+        if ($replied->getTeams()->hasId($foreignEntity->getId())) {
+            return true;
+        }
+
+        return false;
+    }
+}

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

@@ -2,63 +2,60 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Email;
 
 use Espo\Entities\User;
-
+use Espo\Entities\Email;
 use Espo\ORM\Entity;
+use Espo\Core\Acl\DefaultOwnershipChecker;
+use Espo\Core\Acl\OwnershipOwnChecker;
+use Espo\Core\Acl\OwnershipTeamChecker;
 
-use Espo\Core\{
-    Acl\DefaultOwnershipChecker,
-    Acl\OwnershipOwnChecker,
-    Acl\OwnershipTeamChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<Email>
+ * @implements OwnershipTeamChecker<Email>
+ */
 class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 {
-    private $defaultOwnershipChecker;
-
-    public function __construct(DefaultOwnershipChecker $defaultOwnershipChecker)
-    {
-        $this->defaultOwnershipChecker = $defaultOwnershipChecker;
-    }
+    public function __construct(private DefaultOwnershipChecker $defaultOwnershipChecker)
+    {}
 
     public function checkOwn(User $user, Entity $entity): bool
     {
-        if ($user->getId() === $entity->get('assignedUserId')) {
+        if ($user->getId() === $entity->getAssignedUser()?->getId()) {
             return true;
         }
 
-        if ($user->getId() === $entity->get('createdById')) {
+        if ($user->getId() === $entity->getCreatedBy()?->getId()) {
             return true;
         }
 
-        if ($entity->hasLinkMultipleId('assignedUsers', $user->getId())) {
+        if ($entity->getAssignedUsers()->hasId($user->getId())) {
             return true;
         }
 

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

@@ -2,75 +2,83 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\EmailFilter;
 
+use Espo\Entities\EmailAccount;
 use Espo\Entities\User;
-
+use Espo\Entities\EmailFilter;
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
+use Espo\Core\ORM\EntityManager;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-    ORM\EntityManager,
-};
-
+/**
+ * @implements OwnershipOwnChecker<EmailFilter>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
-    private $entityManager;
+    private EntityManager $entityManager;
 
     public function __construct(EntityManager $entityManager)
     {
         $this->entityManager = $entityManager;
     }
 
+    /**
+     * @param EmailFilter $entity
+     */
     public function checkOwn(User $user, Entity $entity): bool
     {
-        if (!$entity->has('parentId') || !$entity->has('parentType')) {
+        if ($entity->isGlobal()) {
             return false;
         }
 
-        $parentType = $entity->get('parentType');
-        $parentId = $entity->get('parentId');
+        $parentType = $entity->getParentType();
+        $parentId = $entity->getParentId();
 
         if (!$parentType || !$parentId) {
             return false;
         }
 
-        $parent = $this->entityManager->getEntity($parentType, $parentId);
+        $parent = $this->entityManager->getEntityById($parentType, $parentId);
 
         if (!$parent) {
             return false;
         }
 
-        if ($parent->getEntityType() === 'User') {
+        if ($parent->getEntityType() === User::ENTITY_TYPE) {
             return $parent->getId() === $user->getId();
         }
 
-        if ($parent->has('assignedUserId') && $parent->get('assignedUserId') === $user->getId()) {
+        if (
+            $parent instanceof EmailAccount &&
+            $parent->has('assignedUserId') &&
+            $parent->get('assignedUserId') === $user->getId()
+        ) {
             return true;
         }
 

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

@@ -2,43 +2,44 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Import;
 
+use Espo\Entities\Import;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\AccessEntityDeleteChecker;
+use Espo\Core\Acl\AccessEntityReadChecker;
+use Espo\Core\Acl\ScopeData;
 
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\AccessEntityReadChecker,
-    Acl\AccessEntityDeleteChecker,
-};
-
+/**
+ * @implements AccessEntityReadChecker<Import>
+ * @implements AccessEntityDeleteChecker<Import>
+ */
 class AccessChecker implements AccessEntityReadChecker, AccessEntityDeleteChecker
 {
     public function check(User $user, ScopeData $data): bool

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

@@ -0,0 +1,47 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Acl\ImportEml;
+
+use Espo\Core\Acl\AccessCreateChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Entities\User;
+
+class AccessChecker implements AccessCreateChecker
+{
+    public function check(User $user, ScopeData $data): bool
+    {
+        return $data->isTrue();
+    }
+
+    public function checkCreate(User $user, ScopeData $data): bool
+    {
+        return $data->isTrue();
+    }
+}

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

@@ -2,65 +2,64 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Note;
 
+use Espo\Core\Acl\Permission;
+use Espo\Core\Acl\Table;
+use Espo\Core\Name\Field;
+use Espo\Entities\Note;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-    AclManager,
-    ORM\EntityManager,
-    Utils\Config,
-};
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\AclManager;
+use Espo\Core\ORM\EntityManager;
+use Espo\Core\Utils\Config;
 
 use DateTime;
 use Exception;
 
+/**
+ * @implements AccessEntityCREDChecker<Note>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
     private const EDIT_PERIOD = '7 days';
-
     private const DELETE_PERIOD = '1 month';
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
-
-    private $entityManager;
-
-    private $config;
+    private DefaultAccessChecker $defaultAccessChecker;
+    private AclManager $aclManager;
+    private EntityManager $entityManager;
+    private Config $config;
 
     public function __construct(
         DefaultAccessChecker $defaultAccessChecker,
@@ -74,6 +73,9 @@ class AccessChecker implements AccessEntityCREDChecker
         $this->config = $config;
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
     {
         $parentId = $entity->get('parentId');
@@ -83,7 +85,7 @@ class AccessChecker implements AccessEntityCREDChecker
             return true;
         }
 
-        $parent = $this->entityManager->getEntity($parentType, $parentId);
+        $parent = $this->entityManager->getEntityById($parentType, $parentId);
 
         if ($parent && $this->aclManager->checkEntityStream($user, $parent)) {
             return true;
@@ -92,6 +94,66 @@ class AccessChecker implements AccessEntityCREDChecker
         return false;
     }
 
+    /**
+     * @param Note $entity
+     */
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        $parentId = $entity->getParentId();
+        $parentType = $entity->getParentType();
+
+        if ($parentId && $parentType) {
+            $parent = $this->entityManager->getEntityById($parentType, $parentId);
+
+            if (!$parent) {
+                return false;
+            }
+
+            return $this->aclManager->checkEntityStream($user, $parent);
+        }
+
+        if ($entity->getType() !== Note::TYPE_POST) {
+            return false;
+        }
+
+        if ($entity->getCreatedById() === $user->getId()) {
+            return true;
+        }
+
+        if ($entity->getTargetType() === Note::TARGET_ALL) {
+            return true;
+        }
+
+        if ($entity->getTargetType() === Note::TARGET_TEAMS) {
+            $targetTeamIdList = $entity->getLinkMultipleIdList(Field::TEAMS);
+
+            foreach ($user->getTeamIdList() as $teamId) {
+                if (in_array($teamId, $targetTeamIdList)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        if ($entity->getTargetType() === Note::TARGET_USERS) {
+            return in_array($user->getId(), $entity->getLinkMultipleIdList('users'));
+        }
+
+        if ($entity->getTargetType() === Note::TARGET_PORTALS) {
+            return $this->aclManager->getPermissionLevel($user, Permission::PORTAL) === Table::LEVEL_YES;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param Note $entity
+     */
     public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
     {
         if ($user->isAdmin()) {
@@ -103,10 +165,10 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
-            return true;
+            return false;
         }
 
-        $createdAt = $entity->get('createdAt');
+        $createdAt = $entity->get(Field::CREATED_AT);
 
         if (!$createdAt) {
             return true;
@@ -123,14 +185,16 @@ class AccessChecker implements AccessEntityCREDChecker
             if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
                 return false;
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
 
         return true;
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
     {
         if ($user->isAdmin()) {
@@ -142,10 +206,10 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
-            return true;
+            return false;
         }
 
-        $createdAt = $entity->get('createdAt');
+        $createdAt = $entity->get(Field::CREATED_AT);
 
         if (!$createdAt) {
             return true;
@@ -162,8 +226,7 @@ class AccessChecker implements AccessEntityCREDChecker
             if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
                 return false;
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
 

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

@@ -2,47 +2,49 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Note;
 
+use Espo\Entities\Note;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<Note>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
+    /**
+     * @param Note $entity
+     */
     public function checkOwn(User $user, Entity $entity): bool
     {
-
-        if ($entity->get('type') === 'Post' && $user->getId() === $entity->get('createdById')) {
+        if ($entity->getType() === Note::TYPE_POST && $user->getId() === $entity->getCreatedById()) {
             return true;
         }
 

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

@@ -2,41 +2,41 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Notification;
 
+use Espo\Entities\Notification;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<Notification>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

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

@@ -2,61 +2,56 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Portal;
 
+use Espo\Core\Acl\Permission;
+use Espo\Entities\Portal;
 use Espo\Entities\User;
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Table;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\AclManager;
 
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-    Acl\Table,
-    AclManager,
-};
-
+/**
+ * @implements AccessEntityCREDChecker<Portal>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
-
-    public function __construct(DefaultAccessChecker $defaultAccessChecker, AclManager $aclManager)
-    {
-        $this->defaultAccessChecker = $defaultAccessChecker;
-        $this->aclManager = $aclManager;
-    }
+    public function __construct(private DefaultAccessChecker $defaultAccessChecker, private AclManager $aclManager)
+    {}
 
     public function check(User $user, ScopeData $data): bool
     {
-        $level = $this->aclManager->getPermissionLevel($user, 'portal');
+        $level = $this->aclManager->getPermissionLevel($user, Permission::PORTAL);
 
         return $level === Table::LEVEL_YES;
     }

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

@@ -2,49 +2,49 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\ScheduledJob;
 
+use Espo\Entities\ScheduledJob;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
 
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-};
-
+/**
+ * @implements AccessEntityCREDChecker<ScheduledJob>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
+    private DefaultAccessChecker $defaultAccessChecker;
 
     public function __construct(DefaultAccessChecker $defaultAccessChecker)
     {

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

@@ -2,46 +2,47 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Team;
 
+use Espo\Core\Name\Field;
+use Espo\Entities\Team;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<Team>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool
     {
-        $userTeamIdList = $user->getLinkMultipleIdList('teams');
+        $userTeamIdList = $user->getLinkMultipleIdList(Field::TEAMS);
 
         return in_array($entity->getId(), $userTeamIdList);
     }

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

@@ -2,59 +2,54 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\User;
 
+use Espo\Core\Acl\Permission;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\AccessEntityCREDSChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Table;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\AclManager;
 
-use Espo\Core\{
-    Acl\Table,
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDSChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-    AclManager,
-};
-
+/**
+ * @implements AccessEntityCREDSChecker<User>
+ */
 class AccessChecker implements AccessEntityCREDSChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
-
-    public function __construct(DefaultAccessChecker $defaultAccessChecker, AclManager $aclManager)
-    {
-        $this->defaultAccessChecker = $defaultAccessChecker;
-        $this->aclManager = $aclManager;
-    }
+    public function __construct(
+        private DefaultAccessChecker $defaultAccessChecker,
+        private AclManager $aclManager,
+    ) {}
 
     public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
     {
@@ -71,8 +66,12 @@ class AccessChecker implements AccessEntityCREDSChecker
 
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
     {
+        if (!$user->isAdmin() && !$entity->isActive()) {
+            return false;
+        }
+
         if ($entity->isPortal()) {
-            if ($this->aclManager->getPermissionLevel($user, 'portal') === Table::LEVEL_YES) {
+            if ($this->aclManager->getPermissionLevel($user, Permission::PORTAL) === Table::LEVEL_YES) {
                 return true;
             }
 
@@ -124,6 +123,7 @@ class AccessChecker implements AccessEntityCREDSChecker
 
     public function checkEntityStream(User $user, Entity $entity, ScopeData $data): bool
     {
-        return $this->aclManager->checkUserPermission($user, $entity, 'user');
+        /** @noinspection PhpRedundantOptionalArgumentInspection */
+        return $this->aclManager->checkUserPermission($user, $entity, Permission::USER);
     }
 }

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

@@ -2,42 +2,44 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\User;
 
+use Espo\Core\Name\Field;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\ORM\Entity as CoreEntity;
+use Espo\Core\Acl\OwnershipOwnChecker;
+use Espo\Core\Acl\OwnershipTeamChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-    Acl\OwnershipTeamChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<User>
+ * @implements OwnershipTeamChecker<User>
+ */
 class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 {
     public function checkOwn(User $user, Entity $entity): bool
@@ -47,9 +49,11 @@ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 
     public function checkTeam(User $user, Entity $entity): bool
     {
+        assert($entity instanceof CoreEntity);
+
         $intersect = array_intersect(
-            $user->getLinkMultipleIdList('teams'),
-            $entity->getLinkMultipleIdList('teams')
+            $user->getLinkMultipleIdList(Field::TEAMS),
+            $entity->getLinkMultipleIdList(Field::TEAMS)
         );
 
         if (count($intersect)) {

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

@@ -2,50 +2,48 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Webhook;
 
 use Espo\Entities\User;
-
+use Espo\Entities\Webhook;
 use Espo\ORM\Entity;
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
 
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-};
-
+/**
+ * @implements AccessEntityCREDChecker<Webhook>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
     public function __construct(DefaultAccessChecker $defaultAccessChecker)
     {
         $this->defaultAccessChecker = $defaultAccessChecker;

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

@@ -2,41 +2,41 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\Acl\Webhook;
 
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
+/**
+ * @implements OwnershipOwnChecker<\Espo\Entities\Webhook>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

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

@@ -0,0 +1,90 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Acl\WorkingTimeRange;
+
+use Espo\Core\Acl\AssignmentChecker as AssignmentCheckerInterface;
+use Espo\Core\Acl\DefaultAssignmentChecker;
+use Espo\Core\AclManager;
+use Espo\Entities\User;
+use Espo\Entities\WorkingTimeRange;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Name\Attribute;
+
+/**
+ * @implements AssignmentCheckerInterface<WorkingTimeRange>
+ */
+class AssignmentChecker implements AssignmentCheckerInterface
+{
+    private DefaultAssignmentChecker $defaultAssignmentChecker;
+    private AclManager $aclManager;
+    private EntityManager $entityManager;
+
+    public function __construct(
+        DefaultAssignmentChecker $defaultAssignmentChecker,
+        AclManager $aclManager,
+        EntityManager $entityManager
+    ) {
+        $this->defaultAssignmentChecker = $defaultAssignmentChecker;
+        $this->aclManager = $aclManager;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @param WorkingTimeRange $entity
+     */
+    public function check(User $user, Entity $entity): bool
+    {
+        $result = $this->defaultAssignmentChecker->check($user, $entity);
+
+        if (!$result) {
+            return false;
+        }
+
+        if (!$entity->isAttributeChanged('usersIds')) {
+            return true;
+        }
+
+        $users = $this->entityManager
+            ->getRDBRepositoryByClass(User::class)
+            ->where([Attribute::ID => $entity->getUsers()->getIdList()])
+            ->find();
+
+        foreach ($users as $targetUser) {
+            $accessToUser = $this->aclManager->check($user, $targetUser);
+
+            if (!$accessToUser) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -2,58 +2,55 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AclPortal\Attachment;
 
-use Espo\Entities\{
-    User,
-    Note,
-};
-
+use Espo\Entities\Attachment;
+use Espo\Entities\Note;
+use Espo\Entities\Settings;
+use Espo\Entities\User;
 use Espo\ORM\Entity;
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\ORM\EntityManager;
+use Espo\Core\Portal\Acl\DefaultAccessChecker;
+use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\Portal\AclManager;
 
-use Espo\Core\{
-    ORM\EntityManager,
-    Portal\AclManager,
-    Acl\ScopeData,
-    Acl\AccessEntityCREDChecker,
-    Portal\Acl\DefaultAccessChecker,
-    Portal\Acl\Traits\DefaultAccessCheckerDependency,
-};
-
+/**
+ * @implements AccessEntityCREDChecker<Attachment>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
-
-    private $entityManager;
+    private DefaultAccessChecker $defaultAccessChecker;
+    private AclManager $aclManager;
+    private EntityManager $entityManager;
 
     public function __construct(
         DefaultAccessChecker $defaultAccessChecker,
@@ -67,25 +64,28 @@ class AccessChecker implements AccessEntityCREDChecker
 
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
     {
-        if ($entity->get('parentType') === 'Settings') {
+        /** @var Attachment $entity */
+
+        if ($entity->get('parentType') === Settings::ENTITY_TYPE) {
+            // Allow the logo.
             return true;
         }
 
         $parent = null;
-        $hasParent = false;
 
-        if ($entity->get('parentId') && $entity->get('parentType')) {
-            $hasParent = true;
+        $parentType = $entity->get('parentType');
+        $parentId = $entity->get('parentId');
 
-            $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
-        }
-        else if ($entity->get('relatedId') && $entity->get('relatedType')) {
-            $hasParent = true;
+        $relatedType = $entity->get('relatedType');
+        $relatedId = $entity->get('relatedId');
 
-            $parent = $this->entityManager->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
+        if ($parentId && $parentType) {
+            $parent = $this->entityManager->getEntityById($parentType, $parentId);
+        } else if ($relatedId && $relatedType) {
+            $parent = $this->entityManager->getEntityById($relatedType, $relatedId);
         }
 
-        if (!$hasParent) {
+        if (!$parent) {
             if ($entity->get('createdById') === $user->getId()) {
                 return true;
             }
@@ -93,14 +93,21 @@ class AccessChecker implements AccessEntityCREDChecker
             return false;
         }
 
-        if ($parent->getEntityType() === 'Note') {
+        if ($parent->getEntityType() === Note::ENTITY_TYPE) {
+            /** @var Note $parent */
             $result = $this->checkEntityReadNoteParent($user, $parent);
 
             if ($result !== null) {
                 return $result;
             }
-        }
-        else if ($this->aclManager->checkEntity($user, $parent)) {
+        } else if ($this->aclManager->checkEntity($user, $parent)) {
+            if (
+                $entity->getTargetField() &&
+                !$this->aclManager->checkField($user, $parent->getEntityType(), $entity->getTargetField())
+            ) {
+                return false;
+            }
+
             return true;
         }
 
@@ -132,7 +139,7 @@ class AccessChecker implements AccessEntityCREDChecker
 
         if ($note->getTargetType() === Note::TARGET_USERS) {
             $isRelated = $this->entityManager
-                ->getRDBRepository('Note')
+                ->getRDBRepository(Note::ENTITY_TYPE)
                 ->getRelation($note, 'users')
                 ->isRelated($user);
 
@@ -147,7 +154,7 @@ class AccessChecker implements AccessEntityCREDChecker
             return null;
         }
 
-        $parent = $this->entityManager->getEntity($note->getParentType(), $note->getParentId());
+        $parent = $this->entityManager->getEntityById($note->getParentType(), $note->getParentId());
 
         if ($parent && $this->aclManager->checkEntity($user, $parent)) {
             return true;

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

@@ -2,41 +2,41 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AclPortal\Attachment;
 
+use Espo\Entities\Attachment;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<Attachment>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     private const ATTR_CREATED_BY_ID = 'createdById';

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

@@ -2,60 +2,54 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AclPortal\Email;
 
+use Espo\Entities\Email;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\ORM\Entity as CoreEntity;
+use Espo\Core\Acl\AccessEntityCREDSChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Table;
+use Espo\Core\Portal\Acl\DefaultAccessChecker;
+use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency;
 
-use Espo\Core\{
-    Portal\AclManager,
-    Acl\Table,
-    Acl\ScopeData,
-    Acl\AccessEntityCREDSChecker,
-    Portal\Acl\DefaultAccessChecker,
-    Portal\Acl\Traits\DefaultAccessCheckerDependency,
-};
-
+/**
+ * @implements AccessEntityCREDSChecker<Email>
+ */
 class AccessChecker implements AccessEntityCREDSChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
-
     public function __construct(
-        DefaultAccessChecker $defaultAccessChecker,
-        AclManager $aclManager
+        DefaultAccessChecker $defaultAccessChecker
     ) {
         $this->defaultAccessChecker = $defaultAccessChecker;
-        $this->aclManager = $aclManager;
     }
 
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
@@ -72,9 +66,11 @@ class AccessChecker implements AccessEntityCREDSChecker
             return false;
         }
 
-        $userIdList = $entity->getLinkMultipleIdLIst('users');
+        assert($entity instanceof CoreEntity);
 
-        if (is_array($userIdList) && in_array($user->getId(), $userIdList)) {
+        $userIdList = $entity->getLinkMultipleIdList('users');
+
+        if (in_array($user->getId(), $userIdList)) {
             return true;
         }
 

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

@@ -2,41 +2,41 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AclPortal\Email;
 
+use Espo\Entities\Email;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<Email>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

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

@@ -2,65 +2,62 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AclPortal\Note;
 
+use Espo\Core\Name\Field;
+use Espo\Entities\Note;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Portal\AclManager,
-    Acl\ScopeData,
-    Acl\AccessEntityCREDChecker,
-    Portal\Acl\DefaultAccessChecker,
-    Portal\Acl\Traits\DefaultAccessCheckerDependency,
-    ORM\EntityManager,
-    Utils\Config,
-};
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\ORM\EntityManager;
+use Espo\Core\Portal\Acl\DefaultAccessChecker;
+use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\Portal\AclManager;
+use Espo\Core\Utils\Config;
 
 use DateTime;
 use Exception;
 
+/**
+ * @implements AccessEntityCREDChecker<Note>
+ */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
     private const EDIT_PERIOD = '7 days';
-
     private const DELETE_PERIOD = '1 month';
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
-
-    private $entityManager;
-
-    private $config;
+    private DefaultAccessChecker $defaultAccessChecker;
+    private AclManager $aclManager;
+    private EntityManager $entityManager;
+    private Config $config;
 
     public function __construct(
         DefaultAccessChecker $defaultAccessChecker,
@@ -74,16 +71,19 @@ class AccessChecker implements AccessEntityCREDChecker
         $this->config = $config;
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
     {
-        $parentId = $entity->get('parentId');
-        $parentType = $entity->get('parentType');
+        $parentId = $entity->getParentId();
+        $parentType = $entity->getParentType();
 
         if (!$parentId || !$parentType) {
             return $this->defaultAccessChecker->checkEntityCreate($user, $entity, $data);
         }
 
-        $parent = $this->entityManager->getEntity($parentType, $parentId);
+        $parent = $this->entityManager->getEntityById($parentType, $parentId);
 
         if ($parent && $this->aclManager->checkEntityStream($user, $parent)) {
             return true;
@@ -92,31 +92,42 @@ class AccessChecker implements AccessEntityCREDChecker
         return $this->defaultAccessChecker->checkEntityCreate($user, $entity, $data);
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
     {
-        if ($entity->get('type') !== 'Post') {
-            return false;
-        }
+        $parentId = $entity->getParentId();
+        $parentType = $entity->getParentType();
 
-        if ($entity->get('type') === 'Post' && $entity->get('targetType')) {
-            return false;
-        }
+        if ($parentId && $parentType) {
+            $parent = $this->entityManager->getEntityById($parentType, $parentId);
 
-        if (!$entity->get('parentId') || !$entity->get('parentType')) {
-            return false;
-        }
-
-        $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
-
-        if ($parent) {
-            if ($this->aclManager->checkEntityStream($user, $parent)) {
-                return true;
+            if (!$parent) {
+                return false;
             }
+
+            return $this->aclManager->checkEntityStream($user, $parent);
+        }
+
+        if ($entity->getType() !== Note::TYPE_POST) {
+            return false;
+        }
+
+        if ($entity->getCreatedById() === $user->getId()) {
+            return true;
+        }
+
+        if ($entity->getTargetType() === Note::TARGET_PORTALS) {
+            return in_array($user->getPortalId(), $entity->getLinkMultipleIdList('portals'));
         }
 
         return false;
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
     {
         if (!$this->defaultAccessChecker->checkEntityEdit($user, $entity, $data)) {
@@ -124,10 +135,10 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
-            return true;
+            return false;
         }
 
-        $createdAt = $entity->get('createdAt');
+        $createdAt = $entity->get(Field::CREATED_AT);
 
         if (!$createdAt) {
             return true;
@@ -144,14 +155,16 @@ class AccessChecker implements AccessEntityCREDChecker
             if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
                 return false;
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
 
         return true;
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
     {
         if (!$this->defaultAccessChecker->checkEntityDelete($user, $entity, $data)) {
@@ -159,10 +172,10 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
-            return true;
+            return false;
         }
 
-        $createdAt = $entity->get('createdAt');
+        $createdAt = $entity->get(Field::CREATED_AT);
 
         if (!$createdAt) {
             return true;
@@ -179,8 +192,7 @@ class AccessChecker implements AccessEntityCREDChecker
             if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
                 return false;
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
 

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

@@ -2,46 +2,49 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AclPortal\Note;
 
+use Espo\Entities\Note;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<Note>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
+    /**
+     * @param Note $entity
+     */
     public function checkOwn(User $user, Entity $entity): bool
     {
-        if ($entity->get('type') === 'Post' && $user->getId() === $entity->get('createdById')) {
+        if ($entity->getType() === Note::TYPE_POST && $user->getId() === $entity->getCreatedById()) {
             return true;
         }
 

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

@@ -2,41 +2,41 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AclPortal\Notification;
 
+use Espo\Entities\Notification;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<Notification>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

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

@@ -2,41 +2,40 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AclPortal\User;
 
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
+use Espo\Core\Acl\OwnershipOwnChecker;
 
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
-
+/**
+ * @implements OwnershipOwnChecker<User>
+ */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool

application/Espo/Classes/AddressFormatters/Formatter1.php

@@ -2,37 +2,35 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 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

@@ -2,37 +2,35 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 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

@@ -2,37 +2,35 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 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

@@ -2,37 +2,35 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 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/Binding.php

@@ -2,43 +2,41 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AppInfo;
 
-use Espo\Core\{
-    Utils\Module,
-    Binding\EspoBindingLoader,
-    Binding\Binding as BindingItem,
-    Console\Command\Params,
-};
+use Espo\Core\Binding\Binding as BindingItem;
+use Espo\Core\Binding\EspoBindingLoader;
+use Espo\Core\Console\Command\Params;
+use Espo\Core\Utils\Module;
 
 class Binding
 {
-    private $module;
+    private Module $module;
 
     public function __construct(Module $module)
     {
@@ -69,7 +67,7 @@ class Binding
             $keyList = $data->getContextKeyList($context);
 
             foreach ($keyList as $key) {
-                $result .= $this->printItem($key, $data->getContext($context, $key), true);
+                $result .= $this->printItem($key, $data->getContext($context, $key));
             }
         }
 

application/Espo/Classes/AppInfo/Container.php

@@ -2,50 +2,41 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 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
     {
@@ -63,10 +54,11 @@ class Container
             'user',
         ];
 
+        /** @var string[] $fileList */
         $fileList = scandir('application/Espo/Core/Loaders');
 
         if (file_exists('custom/Espo/Custom/Core/Loaders')) {
-            $fileList = array_merge($fileList, scandir('custom/Espo/Custom/Core/Loaders'));
+            $fileList = array_merge($fileList, scandir('custom/Espo/Custom/Core/Loaders') ?: []);
         }
 
         foreach ($fileList as $file) {

application/Espo/Classes/AppInfo/Jobs.php

@@ -2,28 +2,28 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 

application/Espo/Classes/AppParams/AddressCountryData.php

@@ -0,0 +1,48 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\AppParams;
+
+use Espo\Core\Utils\Address\CountryDataProvider;
+use Espo\Tools\App\AppParam;
+
+class AddressCountryData implements AppParam
+{
+    public function __construct(
+        private CountryDataProvider $provider
+    ) {}
+
+    /**
+     * @return array{list: string[], preferredList: string[]}
+     */
+    public function get(): array
+    {
+        return $this->provider->get();
+    }
+}

application/Espo/Classes/AppParams/Extensions.php

@@ -0,0 +1,92 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\AppParams;
+
+use Espo\Entities\Extension;
+use Espo\Entities\User;
+use Espo\ORM\EntityManager;
+use Espo\Tools\App\AppParam;
+use stdClass;
+
+class Extensions implements AppParam
+{
+    private User $user;
+    private EntityManager $entityManager;
+
+    public function __construct(
+        User $user,
+        EntityManager $entityManager
+    ) {
+        $this->user = $user;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @return stdClass[]
+     */
+    public function get(): array
+    {
+        if (!$this->user->isRegular() && !$this->user->isAdmin()) {
+            return [];
+        }
+
+        $extensionList = $this->entityManager
+            ->getRDBRepositoryByClass(Extension::class)
+            ->where([
+                'licenseStatus' => [
+                    Extension::LICENSE_STATUS_INVALID,
+                    Extension::LICENSE_STATUS_EXPIRED,
+                    Extension::LICENSE_STATUS_SOFT_EXPIRED,
+                ],
+            ])
+            ->find();
+
+        $list = [];
+
+        foreach ($extensionList as $extension) {
+            $list[] = (object) [
+                'name' => $extension->getName(),
+                'version' => $extension->getVersion(),
+                'licenseStatus' => $extension->getLicenseStatus(),
+                'licenseStatusMessage' => $extension->getLicenseStatusMessage(),
+                'isInstalled' => $extension->isInstalled(),
+                'notify' => in_array(
+                    $extension->getLicenseStatus(),
+                    [
+                        Extension::LICENSE_STATUS_INVALID,
+                        Extension::LICENSE_STATUS_EXPIRED,
+                    ]
+                )
+            ];
+        }
+
+        return $list;
+    }
+}

application/Espo/Classes/AppParams/TemplateEntityTypeList.php

@@ -2,58 +2,64 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AppParams;
 
-use Espo\Core\{
-    Acl,
-    Select\SelectBuilderFactory,
-    ORM\EntityManager,
-};
+use Espo\Core\Acl;
+use Espo\Core\ORM\EntityManager;
+use Espo\Core\Select\SelectBuilderFactory;
+use Espo\Entities\Template;
+use Espo\Tools\App\AppParam;
 
 /**
  * Returns a list of entity types for which a PDF template exists.
  */
-class TemplateEntityTypeList
+class TemplateEntityTypeList implements AppParam
 {
-    protected $acl;
-    protected $selectBuilderFactory;
-    protected $entityManager;
+    private Acl $acl;
+    private SelectBuilderFactory $selectBuilderFactory;
+    private EntityManager $entityManager;
 
-    public function __construct(Acl $acl, SelectBuilderFactory $selectBuilderFactory, EntityManager $entityManager)
-    {
+    public function __construct(
+        Acl $acl,
+        SelectBuilderFactory $selectBuilderFactory,
+        EntityManager $entityManager
+    ) {
         $this->acl = $acl;
         $this->selectBuilderFactory = $selectBuilderFactory;
         $this->entityManager = $entityManager;
     }
 
-    public function get() : array
+    /**
+     * @return string[]
+     */
+    public function get(): array
     {
-        if (!$this->acl->checkScope('Template')) {
+        if (!$this->acl->checkScope(Template::ENTITY_TYPE)) {
             return [];
         }
 
@@ -61,7 +67,7 @@ class TemplateEntityTypeList
 
         $query = $this->selectBuilderFactory
             ->create()
-            ->from('Template')
+            ->from(Template::ENTITY_TYPE)
             ->withAccessControlFilter()
             ->buildQueryBuilder()
             ->select(['entityType'])
@@ -69,12 +75,12 @@ class TemplateEntityTypeList
             ->build();
 
         $templateCollection = $this->entityManager
-            ->getRepository('Template')
+            ->getRDBRepositoryByClass(Template::class)
             ->clone($query)
             ->find();
 
         foreach ($templateCollection as $template) {
-            $list[] = $template->get('entityType');
+            $list[] = $template->getTargetEntityType();
         }
 
         return $list;

application/Espo/Classes/AssignmentNotificators/Email.php

@@ -2,91 +2,103 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\AssignmentNotificators;
 
-use Espo\Services\Email as EmailService;
-use Espo\Services\Stream as StreamService;
-
+use Espo\Core\Field\DateTime;
+use Espo\Core\Name\Field;
+use Espo\Core\Notification\DefaultAssignmentNotificator;
+use Espo\Entities\EmailAddress;
+use Espo\Entities\EmailFolder;
+use Espo\Modules\Crm\Entities\Account;
+use Espo\Modules\Crm\Entities\Contact;
+use Espo\Modules\Crm\Entities\Lead;
+use Espo\ORM\Name\Attribute;
+use Espo\Tools\Stream\Service as StreamService;
 use Espo\Core\Notification\AssignmentNotificator;
 use Espo\Core\Notification\AssignmentNotificator\Params;
 use Espo\Core\Notification\UserEnabledChecker;
-use Espo\Core\ServiceFactory;
 use Espo\Core\AclManager;
-
 use Espo\ORM\EntityManager;
 use Espo\ORM\Entity;
-
 use Espo\Entities\User;
 use Espo\Entities\Notification;
+use Espo\Entities\Email as EmailEntity;
+use Espo\Repositories\Email as EmailRepository;
+use Espo\Repositories\EmailAddress as EmailAddressRepository;
+use Espo\Tools\Email\Util;
 
-use DateTime;
-use Exception;
-
+/**
+ * @implements AssignmentNotificator<EmailEntity>
+ */
 class Email implements AssignmentNotificator
 {
     private const DAYS_THRESHOLD = 2;
 
-    private $streamService = null;
-
-    private $user;
-
-    private $entityManager;
-
-    private $serviceFactory;
-
-    private $aclManager;
-
-    private $userChecker;
-
     public function __construct(
-        User $user,
-        EntityManager $entityManager,
-        UserEnabledChecker $userChecker,
-        ServiceFactory $serviceFactory,
-        AclManager $aclManager
-    ) {
-        $this->user = $user;
-        $this->entityManager = $entityManager;
-        $this->userChecker = $userChecker;
-        $this->serviceFactory = $serviceFactory;
-        $this->aclManager = $aclManager;
-    }
+        private User $user,
+        private EntityManager $entityManager,
+        private UserEnabledChecker $userChecker,
+        private AclManager $aclManager,
+        private StreamService $streamService,
+        private DefaultAssignmentNotificator $defaultAssignmentNotificator,
+    ) {}
 
+    /**
+     * @param EmailEntity $entity
+     */
     public function process(Entity $entity, Params $params): void
     {
-        if (!in_array($entity->get('status'), ['Archived', 'Sent', 'Being Imported'])) {
+        if (
+            !in_array(
+                $entity->getStatus(),
+                [
+                    EmailEntity::STATUS_ARCHIVED,
+                    EmailEntity::STATUS_SENT,
+                    EmailEntity::STATUS_BEING_IMPORTED,
+                ]
+            )
+        ) {
             return;
         }
 
-        if ($params->getOption('isJustSent')) {
-            $previousUserIdList = [];
+        if (
+            $entity->getStatus() !== EmailEntity::STATUS_BEING_IMPORTED &&
+            !$this->streamService->checkIsEnabled(EmailEntity::ENTITY_TYPE)
+        ) {
+            $this->defaultAssignmentNotificator->process(
+                $entity,
+                $params->withOption(DefaultAssignmentNotificator::OPTION_FORCE_ASSIGNED_USER, true)
+            );
         }
-        else {
+
+        if ($params->getOption(EmailEntity::SAVE_OPTION_IS_JUST_SENT)) {
+            $previousUserIdList = [];
+        } else {
             $previousUserIdList = $entity->getFetched('usersIds');
 
             if (!is_array($previousUserIdList)) {
@@ -94,30 +106,19 @@ class Email implements AssignmentNotificator
             }
         }
 
-        $dateSent = $entity->get('dateSent');
+        $dateSent = $entity->getDateSent();
 
         if (!$dateSent) {
             return;
         }
 
-        try {
-            $dt = new DateTime($dateSent);
-        }
-        catch (Exception $e) {
-            return;
-        }
-
-        if (!$dt) {
-            return;
-        }
-
-        if ($dt->diff(new DateTime())->days > self::DAYS_THRESHOLD) {
+        if ($dateSent->diff(DateTime::createNow())->days > self::DAYS_THRESHOLD) {
             return;
         }
 
         $emailUserIdList = $entity->get('usersIds');
 
-        if (is_null($emailUserIdList) || !is_array($emailUserIdList)) {
+        if (!is_array($emailUserIdList)) {
             return;
         }
 
@@ -135,15 +136,20 @@ class Email implements AssignmentNotificator
 
         $data = [
             'emailId' => $entity->getId(),
-            'emailName' => $entity->get('name'),
+            'emailName' => $entity->getSubject(),
         ];
 
+        /** @var EmailRepository $emailRepository */
+        $emailRepository = $this->entityManager->getRepository(EmailEntity::ENTITY_TYPE);
+        /** @var EmailAddressRepository $emailAddressRepository */
+        $emailAddressRepository = $this->entityManager->getRepository(EmailAddress::ENTITY_TYPE);
+
         if (!$entity->has('from')) {
-            $this->entityManager->getRepository('Email')->loadFromField($entity);
+            $emailRepository->loadFromField($entity);
         }
 
         if (!$entity->has('to')) {
-            $this->entityManager->getRepository('Email')->loadToField($entity);
+            $emailRepository->loadToField($entity);
         }
 
         $person = null;
@@ -151,82 +157,74 @@ class Email implements AssignmentNotificator
         $from = $entity->get('from');
 
         if ($from) {
-            $person = $this->entityManager
-                ->getRepository('EmailAddress')
-                ->getEntityByAddress($from, null, ['User', 'Contact', 'Lead']);
+            $person = $emailAddressRepository->getEntityByAddress($from, null, [
+                User::ENTITY_TYPE,
+                Contact::ENTITY_TYPE,
+                Lead::ENTITY_TYPE,
+            ]);
 
             if ($person) {
                 $data['personEntityType'] = $person->getEntityType();
-                $data['personEntityName'] = $person->get('name');
+                $data['personEntityName'] = $person->get(Field::NAME);
                 $data['personEntityId'] = $person->getId();
             }
         }
 
         $userIdFrom = null;
 
-        if ($person && $person->getEntityType() === 'User') {
-            $userIdFrom = $person->id;
+        if ($person && $person->getEntityType() === User::ENTITY_TYPE) {
+            $userIdFrom = $person->getId();
         }
 
         if (empty($data['personEntityId'])) {
-            $data['fromString'] = EmailService::parseFromName($entity->get('fromString'));
+            $data['fromString'] = Util::parseFromName($entity->getFromString() ?? '');
 
             if (empty($data['fromString']) && $from) {
                 $data['fromString'] = $from;
             }
         }
 
-        $parent = null;
-
-        if ($entity->get('parentId') && $entity->get('parentType')) {
-            $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
-        }
-
-        $account = null;
-
-        if ($entity->get('accountId')) {
-            $account = $this->entityManager->getEntity('Account', $entity->get('accountId'));
-        }
+        $parent = $entity->getParent();
+        $account = $entity->getAccount();
 
         foreach ($userIdList as $userId) {
-            if (!$userId) {
-                continue;
-            }
-
             if ($userIdFrom === $userId) {
                 continue;
             }
 
-            if ($entity->getLinkMultipleColumn('users', 'inTrash', $userId)) {
+            if (
+                $entity->getUserColumnInTrash($userId) ||
+                $entity->getUserColumnIsRead($userId) ||
+                $entity->getUserSkipNotification($userId)
+            ) {
                 continue;
             }
 
-            if (!$this->userChecker->checkAssignment('Email', $userId)) {
+            if (!$this->userChecker->checkAssignment(EmailEntity::ENTITY_TYPE, $userId)) {
                 continue;
             }
 
             if (
-                $params->getOption('isBeingImported') ||
-                $params->getOption('isJustSent')
+                $params->getOption(EmailEntity::SAVE_OPTION_IS_BEING_IMPORTED) ||
+                $params->getOption(EmailEntity::SAVE_OPTION_IS_JUST_SENT)
             ) {
-                $folderId = $entity->getLinkMultipleColumn('users', 'folderId', $userId);
+                $folderId = $entity->getUserColumnFolderId($userId);
 
-                if ($folderId) {
-                    if (
-                        $this->entityManager
-                            ->getRepository('EmailFolder')
-                            ->where([
-                                'id' => $folderId,
-                                'skipNotifications' => true,
-                            ])
-                            ->count()
-                    ) {
-                        continue;
-                    }
+                if (
+                    $folderId &&
+                    $this->entityManager
+                        ->getRDBRepositoryByClass(EmailFolder::class)
+                        ->where([
+                            'id' => $folderId,
+                            'skipNotifications' => true,
+                        ])
+                        ->count()
+                ) {
+                    continue;
                 }
             }
 
-            $user = $this->entityManager->getEntity('User', $userId);
+            $user = $this->entityManager->getRDBRepositoryByClass(User::class)->getById($userId);
 
             if (!$user) {
                 continue;
@@ -236,18 +234,18 @@ class Email implements AssignmentNotificator
                 continue;
             }
 
-            if (!$this->aclManager->checkScope($user, 'Email')) {
+            if (!$this->aclManager->checkScope($user, EmailEntity::ENTITY_TYPE)) {
                 continue;
             }
 
             $isArchivedOrBeingImported =
-                $entity->get('status') === 'Archived' ||
-                $params->getOption('isBeingImported');
+                $entity->getStatus() === EmailEntity::STATUS_ARCHIVED ||
+                $params->getOption(EmailEntity::SAVE_OPTION_IS_BEING_IMPORTED);
 
             if (
                 $isArchivedOrBeingImported &&
                 $parent &&
-                $this->getStreamService()->checkIsFollowed($parent, $userId)
+                $this->streamService->checkIsFollowed($parent, $userId)
             ) {
                 continue;
             }
@@ -255,20 +253,20 @@ class Email implements AssignmentNotificator
             if (
                 $isArchivedOrBeingImported &&
                 $account &&
-                $this->getStreamService()->checkIsFollowed($account, $userId)
+                $this->streamService->checkIsFollowed($account, $userId)
             ) {
                 continue;
             }
 
             $existing = $this->entityManager
-                ->getRepository(Notification::ENTITY_TYPE)
+                ->getRDBRepository(Notification::ENTITY_TYPE)
                 ->where([
                     'type' => Notification::TYPE_EMAIL_RECEIVED,
                     'userId' => $userId,
                     'relatedId' => $entity->getId(),
-                    'relatedType' => 'Email',
+                    'relatedType' => EmailEntity::ENTITY_TYPE,
                 ])
-                ->select(['id'])
+                ->select([Attribute::ID])
                 ->findOne();
 
             if ($existing) {
@@ -280,17 +278,8 @@ class Email implements AssignmentNotificator
                 'userId' => $userId,
                 'data' => $data,
                 'relatedId' => $entity->getId(),
-                'relatedType' => 'Email',
+                'relatedType' => EmailEntity::ENTITY_TYPE,
             ]);
         }
     }
-
-    private function getStreamService(): StreamService
-    {
-        if (empty($this->streamService)) {
-            $this->streamService = $this->serviceFactory->create('Stream');
-        }
-
-        return $this->streamService;
-    }
 }

application/Espo/Classes/Cleanup/AppLog.php

@@ -0,0 +1,69 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Field\DateTime;
+use Espo\Core\Utils\Config;
+use Espo\Entities\AppLogRecord;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Query\DeleteBuilder;
+
+class AppLog implements Cleanup
+{
+    private const PERIOD = '30 days';
+
+    public function __construct(
+        private EntityManager $entityManager,
+        private Config $config
+    ) {}
+
+    public function process(): void
+    {
+        if (!$this->config->get('cleanupAppLog')) {
+            return;
+        }
+
+        $query = DeleteBuilder::create()
+            ->from(AppLogRecord::ENTITY_TYPE)
+            ->where(['createdAt<' => $this->getBefore()->toString()])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($query);
+    }
+
+    private function getBefore(): DateTime
+    {
+        /** @var string $period */
+        $period = $this->config->get('cleanupAppLogPeriod') ?? self::PERIOD;
+
+        return DateTime::createNow()->modify('-' . $period);
+    }
+}

application/Espo/Classes/Cleanup/Audit.php

@@ -0,0 +1,105 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Field\DateTime;
+use Espo\Core\Utils\Config;
+use Espo\Core\Utils\Metadata;
+use Espo\Entities\Note;
+use Espo\ORM\EntityManager;
+
+/**
+ * @noinspection PhpUnused
+ */
+class Audit implements Cleanup
+{
+    private const PERIOD = '3 months';
+
+    public function __construct(
+        private Metadata $metadata,
+        private EntityManager $entityManager,
+        private Config $config
+    ) {}
+
+    public function process(): void
+    {
+        if (!$this->config->get('cleanupAudit')) {
+            return;
+        }
+
+        $entityTypeList = $this->getEntityTypeList();
+
+        foreach ($entityTypeList as $scope) {
+            $this->processEntityType($scope);
+        }
+    }
+
+    private function processEntityType(string $entityType): void
+    {
+        $query = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from(Note::ENTITY_TYPE)
+            ->where([
+                'parentType' => $entityType,
+                'createdAt<' => $this->getBefore()->toString(),
+                'type' => [Note::TYPE_UPDATE, Note::TYPE_STATUS],
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($query);
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getEntityTypeList(): array
+    {
+        /** @var string[] $scopeList */
+        $scopeList = array_keys($this->metadata->get(['scopes']) ?? []);
+
+        $scopeList = array_filter($scopeList, function ($item) {
+            return $this->metadata->get("scopes.$item.entity") &&
+                !$this->metadata->get("scopes.$item.preserveAuditLog") &&
+                !$this->metadata->get("scopes.$item.stream");
+        });
+
+        return array_values($scopeList);
+    }
+
+    private function getBefore(): DateTime
+    {
+        /** @var string $period */
+        $period = $this->config->get('cleanupAuditPeriod') ?? self::PERIOD;
+
+        return DateTime::createNow()->modify('-' . $period);
+    }
+}

application/Espo/Classes/Cleanup/Exports.php

@@ -0,0 +1,73 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Utils\Config;
+use Espo\ORM\EntityManager;
+
+use Espo\Core\Field\DateTime;
+
+use Espo\Entities\Export;
+
+class Exports implements Cleanup
+{
+    private $config;
+
+    private $entityManager;
+
+    private string $cleanupPeriod = '2 days';
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(): void
+    {
+        $period = '-' . $this->config->get('cleanupExportsPeriod', $this->cleanupPeriod);
+
+        $before = DateTime::createNow()
+            ->modify($period)
+            ->toString();
+
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from(Export::ENTITY_TYPE)
+            ->where([
+                'createdAt<' => $before,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+}

application/Espo/Classes/Cleanup/MassActions.php

@@ -0,0 +1,71 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Utils\Config;
+use Espo\ORM\EntityManager;
+
+use Espo\Core\Field\DateTime;
+
+class MassActions implements Cleanup
+{
+    private $config;
+
+    private $entityManager;
+
+    private string $cleanupPeriod = '14 days';
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(): void
+    {
+        $period = '-' . $this->config->get('cleanupMassActionsPeriod', $this->cleanupPeriod);
+
+        $before = DateTime::createNow()
+            ->modify($period)
+            ->toString();
+
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from('MassAction')
+            ->where([
+                'createdAt<' => $before,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+}

application/Espo/Classes/Cleanup/PasswordChangeRequests.php

@@ -0,0 +1,72 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Utils\Config;
+use Espo\Core\Field\DateTime;
+
+use Espo\ORM\EntityManager;
+
+use Espo\Entities\PasswordChangeRequest;
+
+class PasswordChangeRequests implements Cleanup
+{
+    private Config $config;
+    private EntityManager $entityManager;
+
+    private string $cleanupPeriod = '30 days';
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(): void
+    {
+        $period = '-' . $this->config->get('cleanupPasswordChangeRequestsPeriod', $this->cleanupPeriod);
+
+        $before = DateTime::createNow()
+            ->modify($period)
+            ->toString();
+
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from(PasswordChangeRequest::ENTITY_TYPE)
+            ->where([
+                'createdAt<' => $before,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+}

application/Espo/Classes/Cleanup/Reminders.php

@@ -2,28 +2,28 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
@@ -31,17 +31,18 @@ namespace Espo\Classes\Cleanup;
 
 use Espo\Core\Cleanup\Cleanup;
 use Espo\Core\Utils\Config;
+use Espo\Core\Utils\DateTime as DateTimeUtil;
+use Espo\Modules\Crm\Entities\Reminder;
 use Espo\ORM\EntityManager;
 
 use DateTime;
 
 class Reminders implements Cleanup
 {
-    private $config;
+    private string $cleanupRemindersPeriod = '15 days';
 
-    private $entityManager;
-
-    private $cleanupRemindersPeriod = '15 days';
+    private Config $config;
+    private EntityManager $entityManager;
 
     public function __construct(Config $config, EntityManager $entityManager)
     {
@@ -60,9 +61,9 @@ class Reminders implements Cleanup
         $delete = $this->entityManager
             ->getQueryBuilder()
             ->delete()
-            ->from('Reminder')
+            ->from(Reminder::ENTITY_TYPE)
             ->where([
-                'remindAt<' => $dt->format('Y-m-d'),
+                'remindAt<' => $dt->format(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT),
             ])
             ->build();
 

application/Espo/Classes/Cleanup/Stars.php

@@ -0,0 +1,137 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Utils\Acl\UserAclManagerProvider;
+use Espo\Entities\StarSubscription;
+use Espo\Entities\User;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Query\DeleteBuilder;
+use Espo\Tools\Stars\StarService;
+
+/**
+ * @noinspection PhpUnused
+ */
+class Stars implements Cleanup
+{
+    public function __construct(
+        private EntityManager $entityManager,
+        private UserAclManagerProvider $userAclManagerProvider,
+        private StarService $service
+    ) {}
+
+    public function process(): void
+    {
+        foreach ($this->getEntityTypeList() as $entityType) {
+            $this->processEntityType($entityType);
+        }
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getEntityTypeList(): array
+    {
+        $groups = $this->entityManager->getRDBRepositoryByClass(StarSubscription::class)
+            ->group('entityType')
+            ->select('entityType')
+            ->find();
+
+        $list = [];
+
+        foreach ($groups as $group) {
+            $list[] = $group->get('entityType');
+        }
+
+        return $list;
+    }
+
+    private function processEntityType(string $entityType): void
+    {
+        if (
+            !$this->service->isEnabled($entityType) ||
+            !$this->entityManager->hasRepository($entityType)
+        ) {
+            $deleteQuery = DeleteBuilder::create()
+                ->from(StarSubscription::ENTITY_TYPE)
+                ->where(['entityType' => $entityType])
+                ->build();
+
+            $this->entityManager->getQueryExecutor()->execute($deleteQuery);
+
+            return;
+        }
+
+        $stars = $this->entityManager
+            ->getRDBRepositoryByClass(StarSubscription::class)
+            ->where(['entityType' => $entityType])
+            ->sth()
+            ->find();
+
+        foreach ($stars as $star) {
+            $entityId = $star->get('entityId');
+            $userId = $star->get('userId');
+
+            if ($userId === null || $entityId === null) {
+                continue;
+            }
+
+            $entity = $this->entityManager->getEntityById($entityType, $entityId);
+            $user = $this->entityManager->getRDBRepositoryByClass(User::class)->getById($userId);
+
+            if (!$entity || !$user) {
+                $this->unstar($userId, $entityType, $entityId);
+
+                continue;
+            }
+
+            $aclManager = $this->userAclManagerProvider->get($user);
+
+            if (!$aclManager->checkEntityRead($user, $entity)) {
+                $this->unstar($userId, $entityType, $entityId);
+            }
+        }
+    }
+
+    private function unstar(string $userId, string $entityType, string $entityId): void
+    {
+        $deleteQuery = DeleteBuilder::create()
+            ->from(StarSubscription::ENTITY_TYPE)
+            ->where([
+                'userId' => $userId,
+                'entityType' => $entityType,
+                'entityId' => $entityId,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($deleteQuery);
+    }
+}

application/Espo/Classes/Cleanup/Subscribers.php

@@ -0,0 +1,130 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Field\DateTime;
+use Espo\Core\Name\Field;
+use Espo\Core\Utils\Config;
+use Espo\Core\Utils\Metadata;
+use Espo\Entities\StreamSubscription;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Query\Part\Condition as Cond;
+
+class Subscribers implements Cleanup
+{
+    private const PERIOD = '2 months';
+
+    public function __construct(
+        private Metadata $metadata,
+        private EntityManager $entityManager,
+        private Config $config
+    ) {}
+
+    public function process(): void
+    {
+        if (!$this->config->get('cleanupSubscribers')) {
+            return;
+        }
+
+        /** @var string[] $scopeList */
+        $scopeList = array_keys($this->metadata->get(['scopes']) ?? []);
+
+        /** @var string[] $scopeList */
+        $scopeList = array_values(array_filter(
+            $scopeList,
+            fn ($item) => (bool) $this->metadata->get(['scopes', $item, 'stream'])
+        ));
+
+        foreach ($scopeList as $scope) {
+            $this->processEntityType($scope);
+        }
+    }
+
+    private function processEntityType(string $entityType): void
+    {
+        /** @var ?array<string, mixed> $data */
+        $data = $this->metadata->get(['streamDefs', $entityType, 'subscribersCleanup']);
+
+        if (!($data['enabled'] ?? false)) {
+            return;
+        }
+
+        /** @var string $dateField */
+        $dateField = $data['dateField'] ?? Field::CREATED_AT;
+        /** @var ?string[] $statusList */
+        $statusList = $data['statusList'] ?? null;
+        /** @var ?string $statusField */
+        $statusField = $this->metadata->get(['scopes', $entityType, 'statusField']);
+
+        if ($statusList === null || $statusField === null) {
+            return;
+        }
+
+        /** @var string $period */
+        $period = $this->metadata->get(['streamDefs', $entityType, 'subscribersCleanup', 'period']) ??
+            $this->config->get('cleanupSubscribersPeriod') ??
+            self::PERIOD;
+
+        $before = DateTime::createNow()->modify('-' . $period);
+
+        $query = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from(StreamSubscription::ENTITY_TYPE, 'subscription')
+            ->join(
+                $entityType,
+                'entity',
+                Cond::equal(
+                    Cond::column('entity.id'),
+                    Cond::column('entityId')
+                )
+            )
+            ->where(
+                Cond::and(
+                    Cond::equal(
+                        Cond::column('entityType'),
+                        $entityType
+                    ),
+                    Cond::less(
+                        Cond::column('entity.' . $dateField),
+                        $before->toString()
+                    ),
+                    Cond::in(
+                        Cond::column('entity.' . $statusField),
+                        $statusList
+                    )
+                )
+            )
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($query);
+    }
+}

application/Espo/Classes/Cleanup/TwoFactorCodes.php

@@ -2,28 +2,28 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 

application/Espo/Classes/Cleanup/WebhookQueue.php

@@ -2,28 +2,28 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
@@ -31,42 +31,40 @@ namespace Espo\Classes\Cleanup;
 
 use Espo\Core\Cleanup\Cleanup;
 use Espo\Core\Utils\Config;
+use Espo\Core\Utils\DateTime as DateTimeUtil;
+use Espo\Entities\WebhookEventQueueItem;
+use Espo\Entities\WebhookQueueItem;
 use Espo\ORM\EntityManager;
-
 use DateTime;
+use Espo\ORM\Name\Attribute;
 
+/**
+ * @noinspection PhpUnused
+ */
 class WebhookQueue implements Cleanup
 {
-    private $cleanupWebhookQueuePeriod = '10 days';
+    private string $cleanupWebhookQueuePeriod = '10 days';
 
-    private $config;
-
-    private $entityManager;
-
-    public function __construct(Config $config, EntityManager $entityManager)
-    {
-        $this->config = $config;
-        $this->entityManager = $entityManager;
-    }
+    public function __construct(private Config $config, private EntityManager $entityManager)
+    {}
 
     public function process(): void
     {
         $period = '-' . $this->config->get('cleanupWebhookQueuePeriod', $this->cleanupWebhookQueuePeriod);
 
         $datetime = new DateTime();
-
         $datetime->modify($period);
-        $from = $datetime->format('Y-m-d H:i:s');
+        $from = $datetime->format(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT);
 
         $query1 = $this->entityManager
             ->getQueryBuilder()
             ->delete()
-            ->from('WebhookQueueItem')
+            ->from(WebhookQueueItem::ENTITY_TYPE)
             ->where([
                 'DATE:(createdAt)<' => $from,
                 'OR' => [
-                    'status!=' => 'Pending',
-                    'deleted' => true,
+                    'status!=' => WebhookQueueItem::STATUS_PENDING,
+                    Attribute::DELETED => true,
                 ],
             ])
             ->build();
@@ -76,12 +74,12 @@ class WebhookQueue implements Cleanup
         $query2 = $this->entityManager
             ->getQueryBuilder()
             ->delete()
-            ->from('WebhookEventQueueItem')
+            ->from(WebhookEventQueueItem::ENTITY_TYPE)
             ->where([
                 'DATE:(createdAt)<' => $from,
                 'OR' => [
                     'isProcessed' => true,
-                    'deleted' => true,
+                    Attribute::DELETED => true,
                 ],
             ])
             ->build();

application/Espo/Classes/ConsoleCommands/CheckFilePermissions.php

@@ -0,0 +1,66 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero 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\File\Manager as FileManager;
+use Espo\Core\Utils\System;
+use Espo\Core\Utils\Util;
+
+/**
+ * @noinspection PhpUnused
+ */
+class CheckFilePermissions implements Command
+{
+    public function __construct(
+        private FileManager $fileManager,
+        private System $system
+    ) {}
+
+    public function run(Params $params, IO $io): void
+    {
+        $io->writeLine("\nNote: Run this command under the web server user.\n");
+
+        $io->writeLine('Writable:');
+        $io->writeLine('');
+
+        foreach ($this->fileManager->getPermissionUtils()->getWritableList() as $path) {
+            $fullPath = Util::concatPath($this->system->getRootDir(), $path);
+
+            $isWritable = $this->fileManager->isWritable($fullPath);
+
+            $msg = " " . ($isWritable ? "OK" : "FAIL") . " : $path";
+
+            $io->writeLine($msg);
+        }
+    }
+}

application/Espo/Classes/ConsoleCommands/CreateAdminUser.php

@@ -0,0 +1,103 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero 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\Name\Field;
+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(Field::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

@@ -2,28 +2,28 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
@@ -31,22 +31,17 @@ namespace Espo\Classes\ConsoleCommands;
 
 use Espo\Tools\Import\Service;
 
-use Espo\Core\{
-    Console\Command,
-    Console\Command\Params,
-    Console\IO,
-};
+use Espo\Core\Utils\File\Manager as FileManager;
+use Espo\Core\Console\Command;
+use Espo\Core\Console\Command\Params;
+use Espo\Core\Console\IO;
 
 use Throwable;
 
 class Import implements Command
 {
-    private $service;
-
-    public function __construct(Service $service)
-    {
-        $this->service = $service;
-    }
+    public function __construct(private Service $service, private FileManager $fileManager)
+    {}
 
     public function run(Params $params, IO $io) : void
     {
@@ -64,13 +59,13 @@ class Import implements Command
                 return;
             }
 
-            if (!file_exists($filePath)) {
+            if (!$this->fileManager->isFile($filePath)) {
                 $io->writeLine("File not found.");
 
                 return;
             }
 
-            $contents = file_get_contents($filePath);
+            $contents = $this->fileManager->getContents($filePath);
 
             try {
                 $result = $this->service->importContentsWithParamsId($contents, $paramsId);
@@ -78,14 +73,20 @@ class Import implements Command
                 $resultId = $result->getId();
                 $countCreated = $result->getCountCreated();
                 $countUpdated = $result->getCountUpdated();
-            }
-            catch (Throwable $e) {
-                $io->writeLine("Error occurred: ". $e->getMessage() . "");
+                $countError = $result->getCountError();
+                $countDuplicate = $result->getCountDuplicate();
+            } catch (Throwable $e) {
+                $io->writeLine("Error occurred: " . $e->getMessage());
 
                 return;
             }
 
-            $io->writeLine("Finished. Import ID: {$resultId}. Created: {$countCreated}. Updated: {$countUpdated}.");
+            $io->writeLine("Finished.");
+            $io->writeLine("  Import ID: {$resultId}");
+            $io->writeLine("  Created: {$countCreated}");
+            $io->writeLine("  Updated: {$countUpdated}");
+            $io->writeLine("  Duplicates: {$countDuplicate}");
+            $io->writeLine("  Errors: {$countError}");
 
             return;
         }
@@ -95,9 +96,8 @@ class Import implements Command
 
             try {
                 $this->service->revert($id);
-            }
-            catch (Throwable $e) {
-                $io->writeLine("Error occurred: " . $e->getMessage() . "");
+            } catch (Throwable $e) {
+                $io->writeLine("Error occurred: " . $e->getMessage());
 
                 return;
             }
@@ -112,17 +112,22 @@ class Import implements Command
 
             try {
                 $result = $this->service->importById($id, true, $forceResume);
-            }
-            catch (Throwable $e) {
-                $io->writeLine("Error occurred: " . $e->getMessage() . "");
+            } catch (Throwable $e) {
+                $io->writeLine("Error occurred: " . $e->getMessage());
 
                 return;
             }
 
             $countCreated = $result->getCountCreated();
             $countUpdated = $result->getCountUpdated();
+            $countError = $result->getCountError();
+            $countDuplicate = $result->getCountDuplicate();
 
-            $io->writeLine("Finished. Created: {$countCreated}. Updated: {$countUpdated}.");
+            $io->writeLine("Finished.");
+            $io->writeLine("  Created: {$countCreated}");
+            $io->writeLine("  Updated: {$countUpdated}");
+            $io->writeLine("  Duplicates: {$countDuplicate}");
+            $io->writeLine("  Errors: {$countError}");
 
             return;
         }

application/Espo/Classes/ConsoleCommands/PopulateArrayValues.php

@@ -0,0 +1,108 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero 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\Exceptions\Error;
+use Espo\Core\ORM\Entity as CoreEntity;
+use Espo\Entities\ArrayValue;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+use Espo\Repositories\ArrayValue as ArrayValueRepository;
+
+class PopulateArrayValues implements Command
+{
+    private EntityManager $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @throws Error
+     */
+    public function run(Params $params, IO $io): void
+    {
+        $entityType = $params->getArgument(0);
+        $field = $params->getArgument(1);
+
+        if (!$entityType || !$field) {
+            throw new Error("Entity type and field should be passed as arguments.");
+        }
+
+        if (!$this->entityManager->hasRepository($entityType)) {
+            throw new Error("Bad entity type.");
+        }
+
+        $defs = $this->entityManager->getDefs()->getEntity($entityType);
+
+        if (!$defs->hasAttribute($field)) {
+            throw new Error("Bad field.");
+        }
+
+        if ($defs->getAttribute($field)->getType() !== Entity::JSON_ARRAY) {
+            throw new Error("Non-array field.");
+        }
+
+        if ($defs->getAttribute($field)->isNotStorable()) {
+            throw new Error("Not-storable field.");
+        }
+
+        if (!$defs->getAttribute($field)->getParam('storeArrayValues')) {
+            throw new Error("Array values disabled for the field..");
+        }
+
+        $collection = $this->entityManager
+            ->getRDBRepository($entityType)
+            ->sth()
+            ->find();
+
+        /** @var ArrayValueRepository $repository */
+        $repository = $this->entityManager->getRepository(ArrayValue::ENTITY_TYPE);
+
+        foreach ($collection as $i => $entity) {
+            if (!$entity instanceof CoreEntity) {
+                throw new Error();
+            }
+
+            $repository->storeEntityAttribute($entity, $field);
+
+            if ($i % 1000 === 0) {
+                $io->write('.');
+            }
+        }
+
+        $io->writeLine('');
+        $io->writeLine('Done.');
+    }
+}

application/Espo/Classes/ConsoleCommands/PopulateNumbers.php

@@ -0,0 +1,116 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero 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\Exceptions\ArgumentNotSpecified;
+use Espo\Core\Console\Exceptions\InvalidArgument;
+use Espo\Core\Console\IO;
+use Espo\Core\Exceptions\Error;
+use Espo\Core\FieldProcessing\NextNumber\BeforeSaveProcessor;
+use Espo\Core\Name\Field;
+use Espo\Core\ORM\Entity as CoreEntity;
+use Espo\Core\ORM\Repository\Option\SaveOption;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Query\Part\Order;
+
+class PopulateNumbers implements Command
+{
+    private BeforeSaveProcessor $beforeSaveProcessor;
+    private EntityManager $entityManager;
+
+    public function __construct(
+        BeforeSaveProcessor $beforeSaveProcessor,
+        EntityManager $entityManager
+    ) {
+        $this->beforeSaveProcessor = $beforeSaveProcessor;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @throws Error
+     */
+    public function run(Params $params, IO $io): void
+    {
+        $entityType = $params->getArgument(0);
+        $field = $params->getArgument(1);
+
+        $orderBy = $params->getOption('orderBy') ?? Field::CREATED_AT;
+        $order = strtoupper($params->getOption('order') ?? Order::ASC);
+
+        if (!$entityType) {
+            throw new ArgumentNotSpecified("No entity type argument.");
+        }
+
+        if (!$field) {
+            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)
+            ->getField($field)
+            ->getType();
+
+        if ($fieldType !== 'number') {
+            throw new InvalidArgument("Field `{$field}` is not of `number` type.");
+        }
+
+        $collection = $this->entityManager
+            ->getRDBRepository($entityType)
+            ->where([
+                $field => null,
+            ])
+            ->order($orderBy, $order)
+            ->sth()
+            ->find();
+
+        foreach ($collection as $i => $entity) {
+            if (!$entity instanceof CoreEntity) {
+                throw new Error();
+            }
+
+            $this->beforeSaveProcessor->processPopulate($entity, $field);
+            $this->entityManager->saveEntity($entity, [SaveOption::IMPORT => true]);
+
+            if ($i % 1000 === 0) {
+                $io->write('.');
+            }
+        }
+
+        $io->writeLine('');
+        $io->writeLine('Done.');
+    }
+}

application/Espo/Classes/ConsoleCommands/RebuildCategoryPaths.php

@@ -0,0 +1,69 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero 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\Tools\CategoryTree\RebuildPaths;
+use Exception;
+
+class RebuildCategoryPaths implements Command
+{
+    private RebuildPaths $rebuildPaths;
+
+    public function __construct(RebuildPaths $rebuildPaths)
+    {
+        $this->rebuildPaths = $rebuildPaths;
+    }
+
+    public function run(Params $params, IO $io): void
+    {
+        $entityType = $params->getArgument(0);
+
+        if (!$entityType) {
+            $io->setExitStatus(1);
+            $io->writeLine("Error: No entity type. Should be specified as the first argument.");
+
+            return;
+        }
+
+        try {
+            $this->rebuildPaths->run($entityType);
+        } catch (Exception $e) {
+            $io->setExitStatus(1);
+            $io->writeLine("Error: " . $e->getMessage());
+
+            return;
+        }
+
+        $io->writeLine("Done.");
+    }
+}

application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php

@@ -2,66 +2,82 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\DefaultLayouts;
 
+use Espo\Core\Name\Field;
+use Espo\Core\ORM\Type\FieldType;
 use Espo\Core\Utils\Metadata;
+use Espo\Entities\Team;
+use Espo\Entities\User;
+use Espo\ORM\Defs\Params\FieldParam;
+use Espo\ORM\Defs\Params\RelationParam;
+use stdClass;
 
 class DefaultSidePanelType
 {
-    protected $metadata;
-
-    public function __construct(Metadata $metadata)
-    {
-        $this->metadata = $metadata;
-    }
+    public function __construct(private Metadata $metadata)
+    {}
 
+    /**
+     * @return stdClass[]
+     */
     public function get(string $scope): array
     {
         $list = [];
 
         if (
-            $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUser', 'type']) === 'link'
-            &&
-            $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUser', 'entity']) === 'User'
+            $this->metadata->get(['entityDefs', $scope, 'fields', Field::ASSIGNED_USER, FieldParam::TYPE]) ===
+                FieldType::LINK &&
+            $this->metadata->get(['entityDefs', $scope, 'links', Field::ASSIGNED_USER, RelationParam::ENTITY]) ===
+                User::ENTITY_TYPE
             ||
-            $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUsers', 'type']) === 'linkMultiple'
-            &&
-            $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUsers', 'entity']) === 'User'
+            $this->metadata->get(['entityDefs', $scope, 'fields', Field::ASSIGNED_USERS, FieldParam::TYPE]) ===
+                FieldType::LINK_MULTIPLE &&
+            $this->metadata->get(['entityDefs', $scope, 'links', Field::ASSIGNED_USERS, RelationParam::ENTITY]) ===
+                User::ENTITY_TYPE
         ) {
             $list[] = (object) ['name' => ':assignedUser'];
         }
 
         if (
-            $this->metadata->get(['entityDefs', $scope, 'fields', 'teams', 'type']) === 'linkMultiple'
-            &&
-            $this->metadata->get(['entityDefs', $scope, 'links', 'teams', 'entity']) === 'Team'
+            $this->metadata->get(['entityDefs', $scope, 'fields', Field::TEAMS, FieldParam::TYPE]) ===
+                FieldType::LINK_MULTIPLE &&
+            $this->metadata->get(['entityDefs', $scope, 'links', Field::TEAMS, RelationParam::ENTITY]) ===
+                Team::ENTITY_TYPE
         ) {
-            $list[] = (object) ['name' => 'teams'];
+            $list[] = (object) ['name' => Field::TEAMS];
+        }
+
+        if (
+            $this->metadata->get("entityDefs.$scope.fields.collaborators.type") === FieldType::LINK_MULTIPLE &&
+            $this->metadata->get("entityDefs.$scope.links.collaborators.entity") === User::ENTITY_TYPE
+        ) {
+            $list[] = (object) ['name' => Field::COLLABORATORS];
         }
 
         return $list;

application/Espo/Classes/DuplicateWhereBuilders/Company.php

@@ -2,103 +2,32 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero 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\{
-    Query\Part\Condition as Cond,
-    Query\Part\WhereItem,
-    Query\Part\Where\OrGroup,
-    Entity,
-};
-
-class Company implements WhereBuilder
-{
-    public function build(Entity $entity): ?WhereItem
-    {
-        $orBuilder = OrGroup::createBuilder();
-
-        $toCheck = false;
-
-        if ($entity->get('name')) {
-            $orBuilder->add(
-                Cond::equal(
-                    Cond::column('name'),
-                    $entity->get('name')
-                ),
-            );
-
-            $toCheck = true;
-        }
-
-        if (
-            ($entity->get('emailAddress') || $entity->get('emailAddressData')) &&
-            (
-                $entity->isNew() ||
-                $entity->isAttributeChanged('emailAddress') ||
-                $entity->isAttributeChanged('emailAddressData')
-            )
-        ) {
-            foreach ($this->getEmailAddressList($entity) as $emailAddress) {
-                $orBuilder->add(
-                    Cond::equal(
-                        Cond::column('emailAddress'),
-                        $emailAddress
-                    )
-                );
-
-                $toCheck = true;
-            }
-        }
-
-        if (!$toCheck) {
-            return null;
-        }
-
-        return $orBuilder->build();
-    }
-
-    private function getEmailAddressList(Entity $entity): array
-    {
-        if ($entity->get('emailAddressData')) {
-            /* @var $eaGroup EmailAddressGroup */
-            $eaGroup = $entity->getValueObject('emailAddress');
-
-            return $eaGroup->getAddressList();
-        }
-
-        if ($entity->get('emailAddress')) {
-            return [
-                $entity->get('emailAddress')
-            ];
-        }
-
-        return [];
-    }
-}
+class Company extends General
+{}

application/Espo/Classes/DuplicateWhereBuilders/General.php

@@ -0,0 +1,275 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero 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\Core\Field\EmailAddressGroup;
+use Espo\Core\Field\PhoneNumberGroup;
+use Espo\Core\ORM\Entity as CoreEntity;
+use Espo\Core\ORM\Type\FieldType;
+use Espo\Core\Utils\Config;
+use Espo\Core\Utils\Metadata;
+use Espo\ORM\Defs;
+use Espo\ORM\Entity;
+use Espo\ORM\Query\Part\Condition as Cond;
+use Espo\ORM\Query\Part\Where\OrGroup;
+use Espo\ORM\Query\Part\Where\OrGroupBuilder;
+use Espo\ORM\Query\Part\WhereItem;
+use Espo\ORM\Type\AttributeType;
+
+/**
+ * @implements WhereBuilder<CoreEntity>
+ */
+class General implements WhereBuilder
+{
+    public function __construct(
+        private Metadata $metadata,
+        private Defs $ormDefs,
+        private Config $config
+    ) {}
+
+    /**
+     * @param CoreEntity $entity
+     */
+    public function build(Entity $entity): ?WhereItem
+    {
+        /** @var string[] $fieldList */
+        $fieldList = $this->metadata->get(['scopes', $entity->getEntityType(), 'duplicateCheckFieldList']) ?? [];
+
+        $orBuilder = OrGroup::createBuilder();
+
+        $toCheck = false;
+
+        foreach ($fieldList as $field) {
+            $toCheckItem = $this->applyField($field, $entity, $orBuilder);
+
+            if ($toCheckItem) {
+                $toCheck = true;
+            }
+        }
+
+        if (!$toCheck) {
+            return null;
+        }
+
+        return $orBuilder->build();
+    }
+
+    private function applyField(
+        string $field,
+        CoreEntity $entity,
+        OrGroupBuilder $orBuilder
+    ): bool {
+
+        $type = $this->ormDefs
+            ->getEntity($entity->getEntityType())
+            ->tryGetField($field)
+            ?->getType();
+
+        if ($type === FieldType::PERSON_NAME) {
+            return $this->applyFieldPersonName($field, $entity, $orBuilder);
+        }
+
+        if ($type === FieldType::EMAIL) {
+            return $this->applyFieldEmail($field, $entity, $orBuilder);
+        }
+
+        if ($type === FieldType::PHONE) {
+            return $this->applyFieldPhone($field, $entity, $orBuilder);
+        }
+
+        if ($entity->getAttributeType($field) === AttributeType::VARCHAR) {
+            return $this->applyFieldVarchar($field, $entity, $orBuilder);
+        }
+
+        return false;
+    }
+
+    private function applyFieldPersonName(
+        string $field,
+        CoreEntity $entity,
+        OrGroupBuilder $orBuilder
+    ): bool {
+
+        $first = 'first' . ucfirst($field);
+        $last = 'last' . ucfirst($field);
+
+        if (!$entity->get($first) && !$entity->get($last)) {
+            return false;
+        }
+
+        $orBuilder->add(
+            Cond::and(
+                Cond::equal(
+                    Cond::column($first),
+                    $entity->get($first)
+                ),
+                Cond::equal(
+                    Cond::column($last),
+                    $entity->get($last)
+                )
+            )
+        );
+
+        return true;
+    }
+
+    private function applyFieldEmail(
+        string $field,
+        CoreEntity $entity,
+        OrGroupBuilder $orBuilder
+    ): bool {
+
+        $toCheck = false;
+
+        if (
+            ($entity->get($field) || $entity->get($field . 'Data')) &&
+            (
+                $entity->isNew() ||
+                $entity->isAttributeChanged($field) ||
+                $entity->isAttributeChanged($field . 'Data')
+            )
+        ) {
+            foreach ($this->getEmailAddressList($entity) as $emailAddress) {
+                $orBuilder->add(
+                    Cond::equal(
+                        Cond::column($field),
+                        $emailAddress
+                    )
+                );
+
+                $toCheck = true;
+            }
+        }
+
+        return $toCheck;
+    }
+
+    private function applyFieldPhone(
+        string $field,
+        CoreEntity $entity,
+        OrGroupBuilder $orBuilder
+    ): bool {
+
+        $toCheck = false;
+
+        $isNumeric = $this->config->get('phoneNumberNumericSearch');
+
+        $column = $isNumeric ?
+            $field . 'Numeric' :
+            $field;
+
+        if (
+            ($entity->get($field) || $entity->get($field . 'Data')) &&
+            (
+                $entity->isNew() ||
+                $entity->isAttributeChanged($field) ||
+                $entity->isAttributeChanged($field . 'Data')
+            )
+        ) {
+            foreach ($this->getPhoneNumberList($entity) as $number) {
+                if ($isNumeric) {
+                    $number = preg_replace('/[^0-9]/', '', $number);
+                }
+
+                $orBuilder->add(
+                    Cond::equal(
+                        Cond::column($column),
+                        $number
+                    )
+                );
+
+                $toCheck = true;
+            }
+        }
+
+        return $toCheck;
+    }
+
+    private function applyFieldVarchar(
+        string $field,
+        CoreEntity $entity,
+        OrGroupBuilder $orBuilder
+    ): bool {
+
+        if (!$entity->get($field)) {
+            return false;
+        }
+
+        $orBuilder->add(
+            Cond::equal(
+                Cond::column($field),
+                $entity->get($field)
+            ),
+        );
+
+        return true;
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getEmailAddressList(CoreEntity $entity): array
+    {
+        if ($entity->get('emailAddressData')) {
+            /** @var EmailAddressGroup $eaGroup */
+            $eaGroup = $entity->getValueObject('emailAddress');
+
+            return $eaGroup->getAddressList();
+        }
+
+        if ($entity->get('emailAddress')) {
+            return [
+                $entity->get('emailAddress')
+            ];
+        }
+
+        return [];
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getPhoneNumberList(CoreEntity $entity): array
+    {
+        if ($entity->get('phoneNumberData')) {
+            /** @var PhoneNumberGroup $eaGroup */
+            $eaGroup = $entity->getValueObject('phoneNumber');
+
+            return $eaGroup->getNumberList();
+        }
+
+        if ($entity->get('phoneNumber')) {
+            return [$entity->get('phoneNumber')];
+        }
+
+        return [];
+    }
+}

application/Espo/Classes/DuplicateWhereBuilders/Name.php

@@ -0,0 +1,55 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero 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\Core\Name\Field;
+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(Field::NAME)) {
+            return Cond::equal(
+                Cond::column(Field::NAME),
+                $entity->get(Field::NAME)
+            );
+        }
+
+        return null;
+    }
+}

application/Espo/Classes/DuplicateWhereBuilders/Person.php

@@ -2,112 +2,32 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero 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,
-    Field\EmailAddressGroup,
-};
-
-use Espo\ORM\{
-    Query\Part\Condition as Cond,
-    Query\Part\WhereItem,
-    Query\Part\Where\OrGroup,
-    Entity,
-};
-
-class Person implements WhereBuilder
-{
-    public function build(Entity $entity): ?WhereItem
-    {
-        $orBuilder = OrGroup::createBuilder();
-
-        $toCheck = false;
-
-        if ($entity->get('firstName') || $entity->get('lastName')) {
-            $orBuilder->add(
-                Cond::and(
-                    Cond::equal(
-                        Cond::column('firstName'),
-                        $entity->get('firstName')
-                    ),
-                    Cond::equal(
-                        Cond::column('lastName'),
-                        $entity->get('lastName')
-                    )
-                )
-            );
-
-            $toCheck = true;
-        }
-
-        if (
-            ($entity->get('emailAddress') || $entity->get('emailAddressData')) &&
-            (
-                $entity->isNew() ||
-                $entity->isAttributeChanged('emailAddress') ||
-                $entity->isAttributeChanged('emailAddressData')
-            )
-        ) {
-            foreach ($this->getEmailAddressList($entity) as $emailAddress) {
-                $orBuilder->add(
-                    Cond::equal(
-                        Cond::column('emailAddress'),
-                        $emailAddress
-                    )
-                );
-
-                $toCheck = true;
-            }
-        }
-
-        if (!$toCheck) {
-            return null;
-        }
-
-        return $orBuilder->build();
-    }
-
-    private function getEmailAddressList(Entity $entity): array
-    {
-        if ($entity->get('emailAddressData')) {
-            /* @var $eaGroup EmailAddressGroup */
-            $eaGroup = $entity->getValueObject('emailAddress');
-
-            return $eaGroup->getAddressList();
-        }
-
-        if ($entity->get('emailAddress')) {
-            return [
-                $entity->get('emailAddress')
-            ];
-        }
-
-        return [];
-    }
-}
+class Person extends General
+{}

application/Espo/Classes/FieldConverters/RelationshipRole.php

@@ -0,0 +1,201 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldConverters;
+
+use Espo\Core\Utils\Database\Orm\Defs\AttributeDefs;
+use Espo\Core\Utils\Database\Orm\Defs\EntityDefs;
+use Espo\Core\Utils\Database\Orm\FieldConverter;
+use Espo\ORM\Defs\FieldDefs;
+use Espo\ORM\Defs\Params\RelationParam;
+use Espo\ORM\Name\Attribute;
+use Espo\ORM\Type\AttributeType;
+use RuntimeException;
+
+class RelationshipRole implements FieldConverter
+{
+    public function convert(FieldDefs $fieldDefs, string $entityType): EntityDefs
+    {
+        $name = $fieldDefs->getName();
+
+        $attributeDefs = AttributeDefs::create($name)
+            ->withType(AttributeType::VARCHAR)
+            ->withNotStorable();
+
+        $attributeDefs = $this->addWhere($attributeDefs, $fieldDefs, $entityType);
+
+        return EntityDefs::create()
+            ->withAttribute($attributeDefs);
+    }
+
+    private function addWhere(AttributeDefs $attributeDefs, FieldDefs $fieldDefs, string $entityType): AttributeDefs
+    {
+        $data = $fieldDefs->getParam('converterData');
+
+        if (!is_array($data)) {
+            throw new RuntimeException("No `converterData` in field defs.");
+        }
+
+        /** @var ?string $column */
+        $column = $data['column'] ?? null;
+        /** @var ?string $link */
+        $link = $data['link'] ?? null;
+        /** @var ?string $relationName */
+        $relationName = $data[RelationParam::RELATION_NAME] ?? null;
+        /** @var ?string $nearKey */
+        $nearKey = $data['nearKey'] ?? null;
+
+        if (!$column || !$link || !$relationName || !$nearKey) {
+            throw new RuntimeException("Bad `converterData`.");
+        }
+
+        $midTable = ucfirst($relationName);
+
+        return $attributeDefs->withParamsMerged([
+            'where' => [
+                '=' => [
+                    'whereClause' => [
+                        'id=s' => [
+                            'from' => $midTable,
+                            'select' => [$nearKey],
+                            'whereClause' => [
+                                Attribute::DELETED => false,
+                                $column => '{value}',
+                            ],
+                        ],
+                    ],
+                ],
+                '<>' => [
+                    'whereClause' => [
+                        'id!=s' => [
+                            'from' => $midTable,
+                            'select' => [$nearKey],
+                            'whereClause' => [
+                                Attribute::DELETED => false,
+                                $column => '{value}',
+                            ],
+                        ],
+                    ],
+                ],
+                'IN' => [
+                    'whereClause' => [
+                        'id=s' => [
+                            'from' => $midTable,
+                            'select' => [$nearKey],
+                            'whereClause' => [
+                                Attribute::DELETED => false,
+                                $column => '{value}',
+                            ],
+                        ],
+                    ],
+                ],
+                'NOT IN' => [
+                    'whereClause' => [
+                        'id!=s' => [
+                            'from' => $midTable,
+                            'select' => [$nearKey],
+                            'whereClause' => [
+                                Attribute::DELETED => false,
+                                $column => '{value}',
+                            ],
+                        ],
+                    ],
+                ],
+                'LIKE' => [
+                    'whereClause' => [
+                        'id=s' => [
+                            'from' => $midTable,
+                            'select' => [$nearKey],
+                            'whereClause' => [
+                                Attribute::DELETED => false,
+                                "$column*" => '{value}',
+                            ],
+                        ],
+                    ],
+                ],
+                'NOT LIKE' => [
+                    'whereClause' => [
+                        'id!=s' => [
+                            'from' => $midTable,
+                            'select' => [$nearKey],
+                            'whereClause' => [
+                                Attribute::DELETED => false,
+                                "$column*" => '{value}',
+                            ],
+                        ],
+                    ],
+                ],
+                'IS NULL' => [
+                    'whereClause' => [
+                        'NOT' => [
+                            'EXISTS' => [
+                                'from' => $entityType,
+                                'fromAlias' => 'sq',
+                                'select' => [Attribute::ID],
+                                'leftJoins' => [
+                                    [
+                                        $link,
+                                        'm',
+                                        null,
+                                        ['onlyMiddle' => true]
+                                    ]
+                                ],
+                                'whereClause' => [
+                                    "m.$column!=" => null,
+                                    'sq.id:' => lcfirst($entityType) . '.id',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                'IS NOT NULL' => [
+                    'whereClause' => [
+                        'EXISTS' => [
+                            'from' => $entityType,
+                            'fromAlias' => 'sq',
+                            'select' => [Attribute::ID],
+                            'leftJoins' => [
+                                [
+                                    $link,
+                                    'm',
+                                    null,
+                                    ['onlyMiddle' => true]
+                                ]
+                            ],
+                            'whereClause' => [
+                                "m.$column!=" => null,
+                                'sq.id:' => lcfirst($entityType) . '.id',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+    }
+}

application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php

@@ -0,0 +1,90 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldDuplicators;
+
+use Espo\Core\Record\Duplicator\FieldDuplicator;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+
+use Espo\Repositories\Attachment as AttachmentRepository;
+use Espo\Entities\Attachment;
+
+use stdClass;
+
+class AttachmentMultiple implements FieldDuplicator
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function duplicate(Entity $entity, string $field): stdClass
+    {
+        $valueMap = (object) [];
+
+        /** @var \Espo\ORM\Collection<Attachment> $attachmentList */
+        $attachmentList = $this->entityManager
+            ->getRDBRepository($entity->getEntityType())
+            ->getRelation($entity, $field)
+            ->find();
+
+        if (is_countable($attachmentList) && !count($attachmentList)) {
+            return $valueMap;
+        }
+
+        $idList = [];
+        $nameHash = (object) [];
+        $typeHash = (object) [];
+
+        /** @var AttachmentRepository $attachmentRepository */
+        $attachmentRepository = $this->entityManager->getRepository(Attachment::ENTITY_TYPE);
+
+        foreach ($attachmentList as $attachment) {
+            $copiedAttachment = $attachmentRepository->getCopiedAttachment($attachment);
+
+            $copiedAttachment->set('field', $field);
+
+            $this->entityManager->saveEntity($copiedAttachment);
+
+            $idList[] = $copiedAttachment->getId();
+
+            $nameHash->{$copiedAttachment->getId()} = $copiedAttachment->getName();
+            $typeHash->{$copiedAttachment->getId()} = $copiedAttachment->getType();
+        }
+
+        $valueMap->{$field . 'Ids'} = $idList;
+        $valueMap->{$field . 'Names'} = $nameHash;
+        $valueMap->{$field . 'Types'} = $typeHash;
+
+        return $valueMap;
+    }
+}

application/Espo/Classes/FieldDuplicators/File.php

@@ -0,0 +1,75 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldDuplicators;
+
+use Espo\Core\Record\Duplicator\FieldDuplicator;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+
+use Espo\Repositories\Attachment as AttachmentRepository;
+use Espo\Entities\Attachment;
+
+use stdClass;
+
+class File implements FieldDuplicator
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function duplicate(Entity $entity, string $field): stdClass
+    {
+        $valueMap = (object) [];
+
+        /** @var Attachment|null $attachment */
+        $attachment = $this->entityManager
+            ->getRDBRepository($entity->getEntityType())
+            ->getRelation($entity, $field)
+            ->findOne();
+
+        if (!$attachment) {
+            return $valueMap;
+        }
+
+        /** @var AttachmentRepository $attachmentRepository */
+        $attachmentRepository = $this->entityManager->getRepository(Attachment::ENTITY_TYPE);
+
+        $copiedAttachment = $attachmentRepository->getCopiedAttachment($attachment);
+
+        $idAttribute = $field . 'Id';
+
+        $valueMap->$idAttribute = $copiedAttachment->getId();
+
+        return $valueMap;
+    }
+}

application/Espo/Classes/FieldDuplicators/LinkMultiple.php

@@ -0,0 +1,82 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldDuplicators;
+
+use Espo\Core\Record\Duplicator\FieldDuplicator;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+
+use stdClass;
+
+class LinkMultiple implements FieldDuplicator
+{
+    private EntityManager $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function duplicate(Entity $entity, string $field): stdClass
+    {
+        $valueMap = (object) [];
+
+        $entityDefs = $this->entityManager
+            ->getDefs()
+            ->getEntity($entity->getEntityType());
+
+        if (!$entity->hasRelation($field)) {
+            return $valueMap;
+        }
+
+        $relationDefs = $entityDefs->getRelation($field);
+
+        if (
+            !$relationDefs->hasForeignEntityType() ||
+            !$relationDefs->hasForeignRelationName()
+        ) {
+            return $valueMap;
+        }
+
+        $foreignRelationType = $this->entityManager
+            ->getDefs()
+            ->getEntity($relationDefs->getForeignEntityType())
+            ->getRelation($relationDefs->getForeignRelationName())
+            ->getType();
+
+        if ($foreignRelationType !== Entity::MANY_MANY) {
+            $valueMap->{$field . 'Ids'} = [];
+            $valueMap->{$field . 'Names'} = (object) [];
+            $valueMap->{$field . 'Columns'} = (object) [];
+        }
+
+        return $valueMap;
+    }
+}

application/Espo/Classes/FieldDuplicators/Wysiwyg.php

@@ -0,0 +1,117 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldDuplicators;
+
+use Espo\Core\Record\Duplicator\FieldDuplicator;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+
+use Espo\Repositories\Attachment as AttachmentRepository;
+use Espo\Entities\Attachment;
+
+use stdClass;
+
+class Wysiwyg implements FieldDuplicator
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function duplicate(Entity $entity, string $field): stdClass
+    {
+        $valueMap = (object) [];
+
+        $contents = $entity->get($field);
+
+        if (!$contents) {
+            return $valueMap;
+        }
+
+        $matches = [];
+
+        $matchResult = preg_match_all("/\?entryPoint=attachment&amp;id=([^&=\"']+)/", $contents, $matches);
+
+        if (
+            !$matchResult ||
+            empty($matches[1]) ||
+            !is_array($matches[1])
+        ) {
+            return $valueMap;
+        }
+
+        $attachmentIdList = $matches[1];
+
+        /** @var Attachment[] $attachmentList */
+        $attachmentList = [];
+
+        foreach ($attachmentIdList as $id) {
+            /** @var Attachment|null $attachment */
+            $attachment = $this->entityManager->getEntityById(Attachment::ENTITY_TYPE, $id);
+
+            if (!$attachment) {
+                continue;
+            }
+
+            $attachmentList[] = $attachment;
+        }
+
+        if (!count($attachmentList)) {
+            return $valueMap;
+        }
+
+        /** @var AttachmentRepository $attachmentRepository */
+        $attachmentRepository = $this->entityManager->getRepository(Attachment::ENTITY_TYPE);
+
+        foreach ($attachmentList as $attachment) {
+            $copiedAttachment = $attachmentRepository->getCopiedAttachment($attachment);
+
+            $copiedAttachment->set([
+                'relatedId' => null,
+                'relatedType' => $entity->getEntityType(),
+                'field' => $field,
+            ]);
+
+            $this->entityManager->saveEntity($copiedAttachment);
+
+            $contents = str_replace(
+                '?entryPoint=attachment&amp;id=' . $attachment->getId(),
+                '?entryPoint=attachment&amp;id=' . $copiedAttachment->getId(),
+                $contents
+            );
+        }
+
+        $valueMap->$field = $contents;
+
+        return $valueMap;
+    }
+}

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

@@ -2,62 +2,56 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 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<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 $repository EmailRepository */
-        $repository = $this->entityManager->getRepository('Email');
+        /** @var EmailRepository $repository */
+        $repository = $this->entityManager->getRepository(Email::ENTITY_TYPE);
 
-        $repository->loadFromField($entity);
-        $repository->loadToField($entity);
-        $repository->loadCcField($entity);
-        $repository->loadBccField($entity);
-        $repository->loadReplyToField($entity);
         $repository->loadNameHash($entity);
     }
 }

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

@@ -0,0 +1,60 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldProcessing\Email;
+
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\ORM\EntityManager;
+use Espo\Entities\Email;
+use Espo\ORM\Entity;
+use Espo\Repositories\Email as EmailRepository;
+
+/**
+ * @implements Loader<Email>
+ */
+class AddressLoader implements Loader
+{
+    public function __construct(private EntityManager $entityManager)
+    {}
+    /**
+     * @inheritDoc
+     */
+    public function process(Entity $entity, Params $params): void
+    {
+        /** @var EmailRepository $repository */
+        $repository = $this->entityManager->getRepository(Email::ENTITY_TYPE);
+
+        $repository->loadFromField($entity);
+        $repository->loadToField($entity);
+        $repository->loadCcField($entity);
+        $repository->loadBccField($entity);
+        $repository->loadReplyToField($entity);
+    }
+}

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

@@ -0,0 +1,67 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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 Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldProcessing\Email;
+
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Entities\Email;
+use Espo\Entities\EmailFolder;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Name\Attribute;
+
+/**
+ * @implements Loader<Email>
+ */
+class FolderDataLoader implements Loader
+{
+    public function __construct(private EntityManager $entityManager) {}
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $folderId = $entity->get(Email::USERS_COLUMN_FOLDER_ID);
+
+        if (!$folderId) {
+            return;
+        }
+
+        $folder = $this->entityManager
+            ->getRDBRepositoryByClass(EmailFolder::class)
+            ->select([Attribute::ID, 'name'])
+            ->where([Attribute::ID => $folderId])
+            ->findOne();
+
+        if (!$folder) {
+            return;
+        }
+
+        $entity->set('folderName', $folder->getName());
+    }
+}

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

@@ -2,69 +2,71 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\FieldProcessing\Email;
 
+use Espo\Core\Name\Field;
+use Espo\Entities\User;
+use Espo\Modules\Crm\Entities\Call;
+use Espo\Modules\Crm\Entities\Contact;
+use Espo\Modules\Crm\Entities\Lead;
+use Espo\Modules\Crm\Entities\Meeting;
 use Espo\ORM\Entity;
 use Espo\ORM\EntityManager;
+use Espo\ORM\Name\Attribute;
 use Espo\Repositories\EmailAddress as EmailAddressRepository;
 use Espo\Entities\EmailAddress;
 use Espo\Entities\Email;
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\Mail\Event\Event as EspoEvent;
+use Espo\Core\Mail\Event\EventFactory;
+use Espo\Core\Utils\Log;
 
-use Espo\Core\{
-    FieldProcessing\Loader,
-    FieldProcessing\Loader\Params,
-    Mail\Event\Event as EspoEvent,
-    Mail\Event\EventFactory,
-    Utils\Log,
-};
-
-use ICal\ICal;
 use ICal\Event;
+use ICal\ICal;
 
 use Throwable;
+use stdClass;
 
+/**
+ * @implements Loader<Email>
+ */
 class IcsDataLoader implements Loader
 {
-    private $entityManager;
-
-    private $log;
-
+    /** @var array<string, string> */
     private $entityTypeLinkMap = [
-        'User' => 'users',
-        'Contact' => 'contacts',
-        'Lead' => 'leads',
+        User::ENTITY_TYPE => Meeting::LINK_USERS,
+        Contact::ENTITY_TYPE => Meeting::LINK_CONTACTS,
+        Lead::ENTITY_TYPE => Meeting::LINK_LEADS,
     ];
 
-    public function __construct(EntityManager $entityManager, Log $log)
-    {
-        $this->entityManager = $entityManager;
-        $this->log = $log;
-    }
+    public function __construct(private EntityManager $entityManager, private Log $log)
+    {}
 
     public function process(Entity $entity, Params $params): void
     {
@@ -78,7 +80,7 @@ class IcsDataLoader implements Loader
 
         $ical->initString($icsContents);
 
-        /* @var $event Event */
+        /* @var ?Event $event */
         $event = $ical->events()[0] ?? null;
 
         if ($event === null) {
@@ -107,18 +109,20 @@ class IcsDataLoader implements Loader
                 $valueMap->dateStartDate = $espoEvent->getDateStart();
                 $valueMap->dateEndDate = $espoEvent->getDateEnd();
             }
-        }
-        catch (Throwable $e) {
+        } catch (Throwable $e) {
             $this->log->warning("Error while converting ICS event '" . $entity->getId() . "': " . $e->getMessage());
 
             return;
         }
 
-        /* @var $emailAddressRepository EmailAddressRepository */
+        if ($this->eventAlreadyExists($espoEvent)) {
+            return;
+        }
+
+        /** @var EmailAddressRepository $emailAddressRepository */
         $emailAddressRepository = $this->entityManager->getRepository(EmailAddress::ENTITY_TYPE);
 
         $attendeeEmailAddressList = $espoEvent->getAttendeeEmailAddressList();
-
         $organizerEmailAddress = $espoEvent->getOrganizerEmailAddress();
 
         if ($organizerEmailAddress) {
@@ -145,7 +149,7 @@ class IcsDataLoader implements Loader
             $nameMap = $valueMap->$namesAttribute ?? (object) [];
 
             $idList[] = $personEntity->getId();
-            $nameMap->{$personEntity->getId()} = $personEntity->get('name');
+            $nameMap->{$personEntity->getId()} = $personEntity->get(Field::NAME);
 
             $valueMap->$idsAttribute = $idList;
             $valueMap->$namesAttribute = $nameMap;
@@ -160,7 +164,6 @@ class IcsDataLoader implements Loader
         $this->loadCreatedEvent($entity, $espoEvent, $eventData);
 
         $entity->set('icsEventData', $eventData);
-
         $entity->set('icsEventDateStart', $espoEvent->getDateStart());
 
         if ($espoEvent->isAllDay()) {
@@ -168,7 +171,7 @@ class IcsDataLoader implements Loader
         }
     }
 
-    private function loadCreatedEvent(Entity $entity, EspoEvent $espoEvent, object $eventData): void
+    private function loadCreatedEvent(Entity $entity, EspoEvent $espoEvent, stdClass $eventData): void
     {
         $emailSameEvent = $this->entityManager
             ->getRDBRepository(Email::ENTITY_TYPE)
@@ -190,7 +193,7 @@ class IcsDataLoader implements Loader
         }
 
         $createdEvent = $this->entityManager
-            ->getEntity($emailSameEvent->get('createdEventType'), $emailSameEvent->get('createdEventId'));
+            ->getEntityById($emailSameEvent->get('createdEventType'), $emailSameEvent->get('createdEventId'));
 
         if (!$createdEvent) {
             return;
@@ -199,7 +202,38 @@ class IcsDataLoader implements Loader
         $eventData->createdEvent = (object) [
             'id' => $createdEvent->getId(),
             'entityType' => $emailSameEvent->getEntityType(),
-            'name' => $createdEvent->get('name'),
+            'name' => $createdEvent->get(Field::NAME),
         ];
     }
+
+    private function eventAlreadyExists(EspoEvent $espoEvent): bool
+    {
+        $id = $espoEvent->getUid();
+
+        if (!$id) {
+            return false;
+        }
+
+        $found1 = $this->entityManager
+            ->getRDBRepository(Meeting::ENTITY_TYPE)
+            ->select([Attribute::ID])
+            ->where([Attribute::ID => $id])
+            ->findOne();
+
+        if ($found1) {
+            return true;
+        }
+
+        $found2 = $this->entityManager
+            ->getRDBRepository(Call::ENTITY_TYPE)
+            ->select([Attribute::ID])
+            ->where([Attribute::ID => $id])
+            ->findOne();
+
+        if ($found2) {
+            return true;
+        }
+
+        return false;
+    }
 }

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

@@ -2,50 +2,52 @@
 /************************************************************************
  * This file is part of EspoCRM.
  *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2025 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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,
+ * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero 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/.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://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.
+ * Section 5 of the GNU Affero General Public License version 3.
  *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
 namespace Espo\Classes\FieldProcessing\Email;
 
+use Espo\Core\Name\Field;
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    FieldProcessing\Loader,
-    FieldProcessing\Loader\Params,
-    ORM\EntityManager,
-};
-
+use Espo\ORM\Name\Attribute;
+use Espo\Repositories\EmailAddress as EmailAddressRepository;
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\ORM\EntityManager;
 use Espo\Entities\Email;
 use Espo\Entities\User;
 
+/**
+ * @implements Loader<Email>
+ */
 class StringDataLoader implements Loader
 {
-    private $entityManager;
-
-    private $user;
+    private EntityManager $entityManager;
+    private User $user;
 
+    /** @var array<string, string> */
     private $fromEmailAddressNameCache = [];
 
     public function __construct(EntityManager $entityManager, User $user)
@@ -56,21 +58,24 @@ class StringDataLoader implements Loader
 
     public function process(Entity $entity, Params $params): void
     {
-        $userEmailAdddressIdList = [];
+        /** @var Email $entity */
+
+        $userEmailAddressIdList = [];
 
         $emailAddressCollection = $this->entityManager
-            ->getRDBRepository('User')
+            ->getRDBRepository(User::ENTITY_TYPE)
             ->getRelation($this->user, 'emailAddresses')
-            ->select(['id'])
+            ->select([Attribute::ID])
             ->find();
 
         foreach ($emailAddressCollection as $emailAddress) {
-            $userEmailAdddressIdList[] = $emailAddress->getId();
+            $userEmailAddressIdList[] = $emailAddress->getId();
         }
 
         if (
-            in_array($entity->get('fromEmailAddressId'), $userEmailAdddressIdList) ||
-            $entity->get('createdById') === $this->user->getId() && $entity->get('status') === Email::STATUS_SENT
+            in_array($entity->get('fromEmailAddressId'), $userEmailAddressIdList) ||
+            $entity->get('createdById') === $this->user->getId() &&
+            $entity->getStatus() === Email::STATUS_SENT
         ) {
             $entity->loadLinkMultipleField('toEmailAddresses');
 
@@ -84,11 +89,9 @@ class StringDataLoader implements Loader
             $list = [];
 
             foreach ($idList as $emailAddressId) {
-                $person = $this->entityManager
-                    ->getRepository('EmailAddress')
-                    ->getEntityByAddressId($emailAddressId, null, true);
+                $person = $this->getEmailAddressRepository()->getEntityByAddressId($emailAddressId, null, true);
 
-                $list[] = $person ? $person->get('name') : $names->$emailAddressId;
+                $list[] = $person ? $person->get(Field::NAME) : $names->$emailAddressId;
             }
 
             $entity->set('personStringData', 'To: ' . implode(', ', $list));
@@ -96,6 +99,7 @@ class StringDataLoader implements Loader
             return;
         }
 
+        /**  @var ?string $fromEmailAddressId */
         $fromEmailAddressId = $entity->get('fromEmailAddressId');
 
         if (!$fromEmailAddressId) {
@@ -103,11 +107,9 @@ class StringDataLoader implements Loader
         }
 
         if (!array_key_exists($fromEmailAddressId, $this->fromEmailAddressNameCache)) {
-            $person = $this->entityManager
-                ->getRepository('EmailAddress')
-                ->getEntityByAddressId($fromEmailAddressId, null, true);
+            $person = $this->getEmailAddressRepository()->getEntityByAddressId($fromEmailAddressId, null, true);
 
-            $fromName = $person ? $person->get('name') : null;
+            $fromName = $person?->get(Field::NAME);
 
             $this->fromEmailAddressNameCache[$fromEmailAddressId] = $fromName;
         }
@@ -119,4 +121,10 @@ class StringDataLoader implements Loader
 
         $entity->set('personStringData', $fromName);
     }
+
+    private function getEmailAddressRepository(): EmailAddressRepository
+    {
+        /** @var EmailAddressRepository */
+        return $this->entityManager->getRepository('EmailAddress');
+    }
 }