Update rollup (for 6.5)

.gitignore

@@ -70,27 +70,24 @@ user_privileges/user_privileges_9.php
 
 
 # dependencies COMPOSER
-vendor
-public_html/vendor/*
+/vendor
+/public_html/vendor/*
 
 # dependencies YARN
 yarn-error.log
-node_modules/
-public_html/libraries/*
-public_html/src/node_modules/*
+/node_modules/
+/public_html/libraries/*
+/public_html/src/node_modules/*
 
 # IDEs and editors
-.buildpath
+/.buildpath
 .c9/
 .classpath
 .project
+*.launch
 .settings/
+*.sublime-workspace
 .babelrc
 .sonarlint/
 .history/
-.frontmatter/
-frontmatter.json
-
 *.bak
-*.sublime-workspace
-*.launch

.php-cs-fixer.dist.php

@@ -2,142 +2,142 @@
 
 $config = new PhpCsFixer\Config();
 $config->setRiskyAllowed(true)
-	->setIndent("\t")
-	->setCacheFile(__DIR__ . '/.php-cs-fixer.cache')
-	->setRules([
-		'@PHP80Migration' => true,
-		'@PHP80Migration:risky' => true,
-		'@PhpCsFixer' => true,
-		'@PhpCsFixer:risky' => true,
-		'@PSR2' => true,
-		'list_syntax' => ['syntax' => 'short'],
-		'align_multiline_comment' => true,
-		'array_syntax' => ['syntax' => 'short'],
-		'blank_line_after_namespace' => true,
-		'blank_line_after_opening_tag' => true,
-		'blank_line_before_statement' => false,
-		'binary_operator_spaces' => true,
-		'cast_spaces' => true,
-		'class_definition' => ['single_line' => true],
-		'class_keyword_remove' => false,
-		'combine_consecutive_issets' => true,
-		'combine_consecutive_unsets' => true,
-		'compact_nullable_typehint' => true,
-		'concat_space' => [
-			'spacing' => 'one',
-		],
-		'explicit_string_variable' => false,
-		'declare_equal_normalize' => true,
-		'declare_strict_types' => false,
-		'dir_constant' => false,
-		'doctrine_annotation_braces' => true,
-		'doctrine_annotation_indentation' => true,
-		'doctrine_annotation_spaces' => true,
-		'function_typehint_space' => true,
-		'general_phpdoc_annotation_remove' => false,
-		'single_line_comment_style' => ['comment_types' => ['hash']],
-		'include' => true,
-		'linebreak_after_opening_tag' => true,
-		'lowercase_cast' => true,
-		'magic_constant_casing' => true,
-		'method_chaining_indentation' => true,
-		'class_attributes_separation' => ['elements' => ['method' => 'one']],
-		'method_argument_space' => true,
-		'modernize_types_casting' => true,
-		'multiline_comment_opening_closing' => true,
-		'native_function_casing' => true,
-		'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'all'],
-		'new_with_braces' => true,
-		'no_alias_functions' => true,
-		'no_blank_lines_after_class_opening' => true,
-		'no_blank_lines_after_phpdoc' => true,
-		'no_closing_tag' => true,
-		'no_empty_comment' => true,
-		'no_empty_phpdoc' => true,
-		'no_empty_statement' => true,
-		'no_extra_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
-		'no_leading_import_slash' => true,
-		'no_leading_namespace_whitespace' => true,
-		'no_mixed_echo_print' => [
-			'use' => 'echo',
-		],
-		'no_multiline_whitespace_around_double_arrow' => true,
-		'multiline_whitespace_before_semicolons' => true,
-		'no_null_property_initialization' => true,
-		'no_php4_constructor' => false,
-		'no_short_bool_cast' => true,
-		'echo_tag_syntax' => ['format' => 'long'],
-		'no_superfluous_phpdoc_tags' => false,
-		'no_singleline_whitespace_before_semicolons' => true,
-		'no_spaces_after_function_name' => true,
-		'no_spaces_inside_parenthesis' => true,
-		'no_trailing_comma_in_list_call' => true,
-		'no_trailing_comma_in_singleline_array' => true,
-		'no_trailing_whitespace' => true,
-		'no_trailing_whitespace_in_comment' => true,
-		'no_unneeded_final_method' => true,
-		'no_unused_imports' => true,
-		'no_useless_else' => false,
-		'no_useless_return' => true,
-		'no_whitespace_before_comma_in_array' => true,
-		'no_whitespace_in_blank_line' => true,
-		'normalize_index_brace' => true,
-		'not_operator_with_space' => false,
-		'not_operator_with_successor_space' => false,
-		'object_operator_without_whitespace' => true,
-		'ordered_imports' => true,
-		'php_unit_fqcn_annotation' => true,
-		'phpdoc_add_missing_param_annotation' => [
-			'only_untyped' => false,
-		],
-		'phpdoc_align' => true,
-		'phpdoc_annotation_without_dot' => false,
-		'phpdoc_indent' => true,
-		'general_phpdoc_tag_rename' => true,
-		'phpdoc_inline_tag_normalizer' => true,
-		'phpdoc_tag_type' => ['tags' => ['inheritDoc' => 'inline']],
-		'phpdoc_no_access' => true,
-		'phpdoc_no_empty_return' => false,
-		'phpdoc_no_package' => false,
-		'phpdoc_no_useless_inheritdoc' => true,
-		'phpdoc_order' => true,
-		'phpdoc_scalar' => true,
-		'phpdoc_separation' => ['groups' => [['deprecated', 'link', 'see', 'since'], ['author', 'copyright', 'license'], ['category', 'package', 'subpackage'], ['property', 'property-read', 'property-write'], ['param'], ['return']], 'skip_unlisted_annotations' => true],
-		'phpdoc_single_line_var_spacing' => true,
-		'phpdoc_summary' => true,
-		'phpdoc_trim' => true,
-		'phpdoc_types' => true,
-		'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
-		'phpdoc_var_without_name' => true,
-		'psr_autoloading' => false,
-		'return_type_declaration' => true,
-		'self_accessor' => true,
-		'semicolon_after_instruction' => true,
-		'short_scalar_cast' => true,
-		'error_suppression' => false,
-		'single_blank_line_at_eof' => true,
-		'single_import_per_statement' => true,
-		'single_line_throw' => true,
-		'single_quote' => true,
-		'space_after_semicolon' => true,
-		'standardize_not_equals' => true,
-		'strict_comparison' => false,
-		'strict_param' => false,
-		'switch_case_semicolon_to_colon' => true,
-		'switch_case_space' => true,
-		'ternary_operator_spaces' => true,
-		'ternary_to_null_coalescing' => true,
-		'trailing_comma_in_multiline' => ['after_heredoc' => false, 'elements' => []],
-		'trim_array_spaces' => true,
-		'unary_operator_spaces' => true,
-		'visibility_required' => ['elements' => ['property', 'method']],
-		'void_return' => false,
-		'whitespace_after_comma_in_array' => true,
-	])
-	->setFinder(
-		PhpCsFixer\Finder::create()
-			->exclude('vendor')
-			->in(__DIR__)
-	);
+    ->setIndent("\t")
+    ->setCacheFile(__DIR__ . '/.php-cs-fixer.cache')
+    ->setRules([
+        '@PHP80Migration' => true,
+        '@PHP80Migration:risky' => true,
+        '@PhpCsFixer' => true,
+        '@PhpCsFixer:risky' => true,
+        '@PSR2' => true,
+        'list_syntax' => ['syntax' => 'short'],
+        'align_multiline_comment' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'blank_line_after_namespace' => true,
+        'blank_line_after_opening_tag' => true,
+        'blank_line_before_statement' => false,
+        'binary_operator_spaces' => true,
+        'cast_spaces' => true,
+        'class_definition' => ['single_line' => true],
+        'class_keyword_remove' => false,
+        'combine_consecutive_issets' => true,
+        'combine_consecutive_unsets' => true,
+        'compact_nullable_typehint' => true,
+        'concat_space' => [
+            'spacing' => 'one',
+        ],
+        'explicit_string_variable' => false,
+        'declare_equal_normalize' => true,
+        'declare_strict_types' => false,
+        'dir_constant' => false,
+        'doctrine_annotation_braces' => true,
+        'doctrine_annotation_indentation' => true,
+        'doctrine_annotation_spaces' => true,
+        'function_typehint_space' => true,
+        'general_phpdoc_annotation_remove' => false,
+        'single_line_comment_style' => ['comment_types' => ['hash']],
+        'include' => true,
+        'linebreak_after_opening_tag' => true,
+        'lowercase_cast' => true,
+        'magic_constant_casing' => true,
+        'method_chaining_indentation' => true,
+        'class_attributes_separation' => ['elements' => ['method' => 'one']],
+        'method_argument_space' => true,
+        'modernize_types_casting' => true,
+        'multiline_comment_opening_closing' => true,
+        'native_function_casing' => true,
+        'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'all'],
+        'new_with_braces' => true,
+        'no_alias_functions' => true,
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_closing_tag' => true,
+        'no_empty_comment' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_mixed_echo_print' => [
+            'use' => 'echo',
+        ],
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'multiline_whitespace_before_semicolons' => true,
+        'no_null_property_initialization' => true,
+        'no_php4_constructor' => false,
+        'no_short_bool_cast' => true,
+        'echo_tag_syntax' => ['format' => 'long'],
+        'no_superfluous_phpdoc_tags' => false,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_spaces_after_function_name' => true,
+        'no_spaces_inside_parenthesis' => true,
+        'no_trailing_comma_in_list_call' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_whitespace' => true,
+        'no_trailing_whitespace_in_comment' => true,
+        'no_unneeded_final_method' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => false,
+        'no_useless_return' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_whitespace_in_blank_line' => true,
+        'normalize_index_brace' => true,
+        'not_operator_with_space' => false,
+        'not_operator_with_successor_space' => false,
+        'object_operator_without_whitespace' => true,
+        'ordered_imports' => true,
+        'php_unit_fqcn_annotation' => true,
+        'phpdoc_add_missing_param_annotation' => [
+            'only_untyped' => false,
+        ],
+        'phpdoc_align' => true,
+        'phpdoc_annotation_without_dot' => false,
+        'phpdoc_indent' => true,
+        'general_phpdoc_tag_rename' => true,
+        'phpdoc_inline_tag_normalizer' => true,
+        'phpdoc_tag_type' => ['tags' => ['inheritDoc' => 'inline']],
+        'phpdoc_no_access' => true,
+        'phpdoc_no_empty_return' => false,
+        'phpdoc_no_package' => false,
+        'phpdoc_no_useless_inheritdoc' => true,
+        'phpdoc_order' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_separation' => ['groups' => [['deprecated', 'link', 'see', 'since'], ['author', 'copyright', 'license'], ['category', 'package', 'subpackage'], ['property', 'property-read', 'property-write'], ['param'], ['return']], 'skip_unlisted_annotations' => true],
+        'phpdoc_single_line_var_spacing' => true,
+        'phpdoc_summary' => true,
+        'phpdoc_trim' => true,
+        'phpdoc_types' => true,
+        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+        'phpdoc_var_without_name' => true,
+        'psr_autoloading' => false,
+        'return_type_declaration' => true,
+        'self_accessor' => true,
+        'semicolon_after_instruction' => true,
+        'short_scalar_cast' => true,
+        'error_suppression' => false,
+        'single_blank_line_at_eof' => true,
+        'single_import_per_statement' => true,
+        'single_line_throw' => true,
+        'single_quote' => false,
+        'space_after_semicolon' => true,
+        'standardize_not_equals' => true,
+        'strict_comparison' => false,
+        'strict_param' => false,
+        'switch_case_semicolon_to_colon' => true,
+        'switch_case_space' => true,
+        'ternary_operator_spaces' => true,
+        'ternary_to_null_coalescing' => true,
+        'trailing_comma_in_multiline' => ['after_heredoc' => false, 'elements' => []],
+        'trim_array_spaces' => true,
+        'unary_operator_spaces' => true,
+        'visibility_required' => ['elements' => ['property', 'method']],
+        'void_return' => false,
+        'whitespace_after_comma_in_array' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude('vendor')
+            ->in(__DIR__)
+    );
 
 return $config;

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:11
+FROM debian:bullseye
 
 MAINTAINER [email protected]
 
@@ -24,8 +24,8 @@ RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources
 
 RUN apt-get update
 RUN apt-get install -y --no-install-recommends mariadb-server mariadb-client
-RUN apt-get install -y --no-install-recommends nginx nginx-extras zip unzip cron nodejs npm yarn mc htop openssh-server git
-RUN apt-get install -y --no-install-recommends php${PHP_VER}-fpm php${PHP_VER}-mysql php${PHP_VER}-curl php${PHP_VER}-intl php${PHP_VER}-gd php${PHP_VER}-bcmath php${PHP_VER}-soap php${PHP_VER}-ldap php${PHP_VER}-imap php${PHP_VER}-xml php${PHP_VER}-cli php${PHP_VER}-zip php${PHP_VER}-json php${PHP_VER}-opcache php${PHP_VER}-mbstring php${PHP_VER}-apcu php${PHP_VER}-imagick
+RUN apt-get install -y --no-install-recommends nginx nginx-extras "php${PHP_VER}"-fpm "php${PHP_VER}"-mysql "php${PHP_VER}"-curl "php${PHP_VER}"-intl "php${PHP_VER}"-gd "php${PHP_VER}"-fpm "php${PHP_VER}"-bcmath "php${PHP_VER}"-soap "php${PHP_VER}"-ldap "php${PHP_VER}"-imap "php${PHP_VER}"-xml "php${PHP_VER}"-cli "php${PHP_VER}"-zip "php${PHP_VER}"-json "php${PHP_VER}"-opcache "php${PHP_VER}"-mbstring "php${PHP_VER}"-imagick "php${PHP_VER}"-apcu zip unzip cron nodejs npm yarn
+RUN apt-get install -y --no-install-recommends mc htop openssh-server git
 RUN apt-get -y autoclean
 
 # RUN apt-cache search php
@@ -43,7 +43,7 @@ COPY ./tests/setup/docker_entrypoint.sh /
 RUN rm /var/www/html/.user.ini
 RUN rm /var/www/html/public_html/.user.ini
 
-RUN	service mariadb start; \
+RUN	service mysql start; \
 	mysql -uroot mysql; \
 	mysqladmin password "$DB_ROOT_PASS"; \
 	#echo "ALTER USER 'root'@'localhost' IDENTIFIED BY '$DB_ROOT_PASS';" | mysql --user=root; \

LICENSE

@@ -1,4 +1,4 @@
-YetiForce Public License 5.0
+YetiForce Public License 6.5
 Producer: YetiForce S.A., PL1180002425
 Email: [email protected] (registration of the Software)
 

README.md

@@ -17,6 +17,7 @@
 [![Depfu](https://badges.depfu.com/badges/56870798a59eff717ff60bc775ca6a33/overview.svg)](https://depfu.com/github/YetiForceCompany/YetiForceCRM?project_id=5174)
 [![SecurityHeaders.io](https://img.shields.io/security-headers?url=https%3A%2F%2Fgitdeveloper.yetiforce.com)](https://securityheaders.io/?q=https://gitdeveloper.yetiforce.com)
 [![mozilla-observatory](https://img.shields.io/mozilla-observatory/grade/gitdeveloper.yetiforce.com?publish)](https://observatory.mozilla.org/analyze/gitdeveloper.yetiforce.com)
+[![Docker Hub](https://img.shields.io/badge/docker-ready-blue.svg)](https://registry.hub.docker.com/r/yetiforce/yetiforcecrm/)
 [![Dependency Vulnerabilities](https://img.shields.io/endpoint?url=https%3A%2F%2Fapi-hooks.soos.io%2Fapi%2Fshieldsio-badges%3FbadgeType%3DDependencyVulnerabilities%26pid%3D3fd2seq3i)](https://app.soos.io)
 
 <img src="https://stats.yetiforce.com/matomo.php?idsite=4&amp;rec=1" style="border:0" alt="" />
@@ -95,7 +96,7 @@ Follow us on [Twitter](https://twitter.com/YetiForceEN) or like on [FaceBook](ht
 7. Languages package
    https://github.com/YetiForceCompany/YetiForceCRMLanguages
 
-YetiForce CRM was originally forked from Vtiger CRM and has mechanisms that allow to easily migrate from Vtiger to YetiForce.
+YetiForce CRM was orginally forked from Vtiger CRM and has mechanisms that allow to easily migrate from Vtiger to YetiForce.
 
 Testing Supported By<br/>
 <a href="http://browserstack.com">
@@ -122,6 +123,7 @@ Testing Supported By<br/>
 [![sonarcloud.io sqale](https://sonarcloud.io/api/project_badges/measure?project=YetiForceCRM&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=YetiForceCRM)
 [![sonarcloud.io security](https://sonarcloud.io/api/project_badges/measure?project=YetiForceCRM&metric=security_rating)](https://sonarcloud.io/dashboard?id=YetiForceCRM)
 [![sonarcloud.io vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=YetiForceCRM&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=YetiForceCRM)
+[![Black Duck Security Risk](https://copilot.blackducksoftware.com/github/repos/YetiForceCompany/YetiForceCRM/branches/developer/badge-risk.svg)](https://copilot.blackducksoftware.com/github/repos/YetiForceCompany/YetiForceCRM/branches/developer)
 
 ## 🎯 Contributors
 

api/doc/ManageConsents.json

@@ -706,23 +706,5 @@
                 "in": "header"
             }
         }
-    },
-    "tags": [
-        {
-            "name": "BaseModule",
-            "x-displayName": "Base module"
-        },
-        {
-            "name": "ApprovalsRegister",
-            "x-displayName": "Approvals register"
-        },
-        {
-            "name": "Approvals",
-            "x-displayName": "Approvals"
-        }
-    ],
-    "externalDocs": {
-        "description": "Platform API Interactive Docs",
-        "url": "https://doc.yetiforce.com/api/?urls.primaryName=Manage%20consents"
     }
 }