marellocommerce
diff --git a/‎.gitignore‎
Lines changed: 6 additions & 10 deletions b/‎.gitignore‎
Lines changed: 6 additions & 10 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 302 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 302 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 35 additions & 25 deletions b/‎README.md‎
Lines changed: 35 additions & 25 deletions
diff --git a/‎composer.json‎
Lines changed: 37 additions & 39 deletions b/‎composer.json‎
Lines changed: 37 additions & 39 deletions
diff --git a/‎config/config.yml‎
Lines changed: 16 additions & 15 deletions b/‎config/config.yml‎
Lines changed: 16 additions & 15 deletions
diff --git a/‎config/parameters.yml.dist‎
Lines changed: 5 additions & 0 deletions b/‎config/parameters.yml.dist‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎config/parameters_test.yml.dist‎
Lines changed: 5 additions & 0 deletions b/‎config/parameters_test.yml.dist‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎config/security.yml‎
Lines changed: 1 addition & 6 deletions b/‎config/security.yml‎
Lines changed: 1 addition & 6 deletions
@@ -14,24 +14,21 @@ behat.yml
 !var/logs/
 /var/logs/*
 !var/logs/.gitkeep
-!var/attachment/
-/var/attachment/*
-!var/attachment/.gitkeep
-!var/import_export/
-/var/import_export/*
-!var/import_export/.gitkeep
+!var/data/
+/var/data/*
+!var/data/.gitkeep
 !var/oro-check.php
 !var/SymfonyRequirements.php
 !var/OroRequirements.php
 /vendor
 build/
 /cov
 /public/bundles
-/public/css
-/public/js
+!public/js/
+/public/js/*
+!public/js/.gitkeep
 /public/build
 /public/layout-build
-/public/uploads/users/*
 /public/media/cache
 /public/media/js
 /public/build.js
@@ -46,4 +43,3 @@ phpunit.xml
 /.web-server-pid
 /.vagrant
 /node_modules
-/package.json
@@ -8,21 +8,30 @@ This document contains information on how to download, install, and start using
 
 Marello Enterprise is a Symfony 4.4 based application with the following requirements:
 
-* PHP 7.3.13 or above with command line interface
+* PHP 7.4.14 or above with command line interface
 * PHP Extensions
-    * Ctype
-    * Fileinfo
-    * GD 2.0 and above
-    * Intl (ICU library 4.4 and above)
-    * JSON
-    * Mbstring
-    * Mysql
-    * PCRE 8.0 and above
-    * SimpleXML
-    * Tokenizer
-    * Xml
-    * Zip    
-* MySQL 5.7 or above
+    * ctype
+    * curl
+    * fileinfo
+    * gd
+    * intl (ICU library 4.4 and above)
+    * json
+    * mbstring
+    * openssl
+    * mysql
+    * pcre
+    * simplexml
+    * tokenizer
+    * xml
+    * zip
+    * imap
+    * soap
+    * bcmath
+    * ldap  
+    * pgsql
+* MySQL 8.0 or PostgreSQL >=12.5 (optional)
+* Elasticsearch >=7.7, <8.0 (optional)
+* RabbitMQ 3.8.x (optional)
 
 ## Installation instructions
 
@@ -42,7 +51,7 @@ where x.y.z is the latest [release tag](https://github.com/marellocommerce/marel
 
 - Install [Composer][1] globally following the official Composer installation documentation
 
-- Make sure that you have [NodeJS][3] >=12.0 installed
+- Make sure that you have [NodeJS][4] >=12.0, <15.0 installed
 
 - Install Marello dependencies with composer. If installation process seems too slow you can use `--prefer-dist` option. Go to marello-application folder and run composer installation:
 
@@ -85,8 +94,8 @@ php bin/console oro:message-queue:consume --env=prod
 ```
 **Note** We do recommend to use a supervisor for running the ``oro:message-queue:consume`` command. This will make sure that the command and
 the consumer will run all the time. This has become important for every Oro Platform based application since a lot of background tasks depend
- on the consumer to run. For more information about configuration and what supervisor can do for you can either be found in the [Oro(CRM) docs][5] or the
- [site of Supervisord][6].
+ on the consumer to run. For more information about configuration and what supervisor can do for you can either be found in the [Oro(CRM) docs][6] or the
+ [site of Supervisord][7].
 
 **Note:** ``bin/console`` is a path from project root folder. Please make sure you are using full path for crontab configuration or if you running console command from other location.
 
@@ -96,7 +105,7 @@ Installed PHP Accelerators must be compatible with Symfony and Doctrine (support
 
 Note that the port used in Websocket must be open in firewall for outgoing/incoming connections
 
-Using MySQL 5.6 on HDD is potentially risky because of performance issues
+Using MySQL 8.0.x on HDD is potentially risky because of performance issues
 
 Recommended configuration for this case:
 
@@ -106,7 +115,7 @@ And ensure that timeout has default value
 
     wait_timeout = 28800
 
-See [Optimizing InnoDB Disk I/O][2] for more
+See [Oro's recommendation regarding optimization][2] and [Optimizing InnoDB Disk I/O][3] for more
 
 ## PostgreSQL installation notes
 
@@ -119,15 +128,16 @@ CREATE EXTENSION "uuid-ossp";
 
 ## Web Server Configuration
 
-The Marello Enterprise application is based on the Symfony standard application so web server configuration recommendations are the [same][4].
+The Marello Enterprise application is based on the Symfony standard application so web server configuration recommendations are the [same][5].
 
 ## Package Manager Configuration
 
 Github OAuth token should be configured in package manager settings
 
 [1]:  https://getcomposer.org/
-[2]:  https://dev.mysql.com/doc/refman/5.6/en/optimizing-innodb-diskio.html
-[3]:  https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager
-[4]:  https://symfony.com/doc/3.4/setup/web_server_configuration.html
-[5]:  https://oroinc.com/orocrm/doc/current/install-upgrade/installation-quick-start-dev/crm#step-4-post-installation-environment-configuration
-[6]:  https://supervisord.org/
+[2]:  https://doc.oroinc.com/backend/setup/system-requirements/database-optimization/
+[3]:  https://dev.mysql.com/doc/refman/8.0/en/optimizing-innodb-diskio.html
+[4]:  https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager
+[5]:  https://symfony.com/doc/4.4/setup/web_server_configuration.html
+[6]:  https://oroinc.com/orocrm/doc/current/install-upgrade/installation-quick-start-dev/crm#step-4-post-installation-environment-configuration
+[7]:  https://supervisord.org/
@@ -23,10 +23,6 @@
             "type": "composer",
             "url": "https://packagist.orocrm.com"
         },
-        "asset-packagist": {
-            "type": "composer",
-            "url": "https://asset-packagist.orocrm.com"
-        },
         "platform-enterprise": {
             "type": "vcs",
             "url": "https://github.com/oroinc/platform-enterprise.git"
@@ -45,35 +41,41 @@
         }
     },
     "require": {
-        "oro/platform-enterprise": "4.1.*",
-        "oro/platform-serialised-fields": "4.1.*",
-        "oro/calendar-bundle": "4.1.*",
-        "oro/health-check-bundle": "4.1.*",
-        "marellocommerce/marello-enterprise": "~3.1.0"
+        "oro/platform-enterprise": "4.2.*",
+        "oro/platform-serialised-fields": "4.2.*",
+        "oro/calendar-bundle": "4.2.*",
+        "oro/health-check-bundle": "4.2.*",
+        "oro/oauth2-server": "4.2.*",
+        "marellocommerce/marello-enterprise": "~3.2.0"
     },
     "require-dev": {
-        "behat/behat": "3.4.*",
-        "behat/gherkin": "4.6.0",
-        "behat/mink": "dev-master#6d637f7af4816c26ad8a943da2e3f7eef1231bea",
-        "behat/mink-extension": "2.3.*",
-        "behat/mink-selenium2-driver": "1.3.1",
-        "behat/symfony2-extension": "2.1.*",
-        "guzzlehttp/guzzle": "^6.0.0",
-        "nelmio/alice": "3.6.*",
-        "theofidry/alice-data-fixtures": "1.0.*",
-        "phpunit/phpunit": "7.5.*",
-        "johnkary/phpunit-speedtrap": "3.0.*",
-        "mybuilder/phpunit-accelerator": "dev-master",
+        "behat/behat": "~3.8.1",
+        "behat/gherkin": "~4.7.1",
+        "behat/mink": "~1.8.1",
+        "behat/mink-extension": "~2.3.1",
+        "behat/mink-selenium2-driver": "~1.4.0",
+        "behat/symfony2-extension": "~2.1.5",
+        "friendsofphp/php-cs-fixer": "~2.18.2",
+        "johnkary/phpunit-speedtrap": "~3.3.0",
+        "nelmio/alice": "~3.8.0",
+        "oro/twig-inspector": "1.0.*",
+        "phpmd/phpmd": "2.8.*",
+        "phpunit/phpunit": "~9.5.1",
+        "sebastian/phpcpd": "6.0.*",
         "squizlabs/php_codesniffer": "3.5.*",
-        "phpmd/phpmd": "2.6.*",
-        "sebastian/phpcpd": "4.0.*",
-        "phpunit/phpcov": "5.0.*",
-        "symfony/phpunit-bridge": "4.4.*",
-        "friendsofphp/php-cs-fixer": "2.16.*",
-        "oro/twig-inspector": "1.0.*"
+        "symfony/browser-kit": "4.4.18",
+        "symfony/css-selector": "4.4.18",
+        "symfony/debug": "4.4.18",
+        "symfony/debug-bundle": "4.4.18",
+        "symfony/dom-crawler": "4.4.18",
+        "symfony/phpunit-bridge": "4.4.18",
+        "symfony/stopwatch": "4.4.18",
+        "symfony/var-dumper": "4.4.18",
+        "symfony/var-exporter": "4.4.18",
+        "symfony/web-profiler-bundle": "4.4.18",
+        "theofidry/alice-data-fixtures": "~1.4.0"
     },
     "config": {
-        "component-dir": "public/bundles/components",
         "bin-dir": "bin",
         "fxp-asset": {
             "enabled": false
@@ -82,37 +84,33 @@
     "scripts": {
         "post-install-cmd": [
             "@build-parameters",
-            "@build-bootstrap",
-            "@install-requirements-file",
             "@set-permissions",
             "@install-assets",
             "@set-assets-version"
         ],
         "post-update-cmd": [
             "@build-parameters",
-            "@build-bootstrap",
-            "@install-requirements-file",
             "@set-permissions",
-            "@install-assets",
+            "@update-assets",
             "@set-assets-version"
         ],
         "build-parameters": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
         ],
-        "build-bootstrap": [
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ],
-        "install-requirements-file": [
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
-        ],
         "set-permissions": [
             "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::setPermissions"
         ],
         "install-assets": [
             "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::installAssets"
         ],
+        "update-assets": [
+            "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::updateAssets"
+        ],
         "set-assets-version": [
             "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::setAssetsVersion"
+        ],
+        "set-parameters": [
+            "Oro\\Bundle\\InstallerBundle\\Composer\\ParametersHandler::set"
         ]
     },
     "minimum-stability": "dev",
 
@@ -27,6 +27,7 @@ framework:
         save_path:            '%kernel.project_dir%/var/sessions/%kernel.environment%'
         gc_maxlifetime:       3600
         cookie_httponly:      true
+        cookie_secure:        'auto'
     fragments:
         enabled:              true
         path:                 /_fragment # used for controller action in template
@@ -37,7 +38,7 @@ framework:
 twig:
     debug:                    "%kernel.debug%"
     strict_variables:         "%kernel.debug%"
-    exception_controller:     "Oro\\Bundle\\UIBundle\\Controller\\ExceptionController::showAction"
+    exception_controller:     null # use framework.error_controller instead
     globals:
         bap:
             layout:           base.html.twig  # default layout across all Oro bundles
@@ -57,21 +58,21 @@ fos_rest:
         decoders:
             json: fos_rest.decoder.json
     view:
-        failed_validation:    HTTP_BAD_REQUEST
-        default_engine:       php
+        failed_validation: HTTP_BAD_REQUEST
+        default_engine: php
         formats:
-            json:             true
-            xml:              false
+            json: true
+            xml: false
     format_listener:
         rules:
             - { path: '^/api/rest', priorities: [ json ], fallback_format: json, prefer_extension: false }
             - { path: '^/api/soap', stop: true }
             - { path: '^/', stop: true }
     routing_loader:
-        default_format:       json
+        default_format: json
 
 fos_js_routing:
-    routes_to_expose:         [oro_*]
+    routes_to_expose: ['oro_.*', 'oropro_.*', 'marello_.*']
 
 stof_doctrine_extensions:
     default_locale: en
@@ -81,15 +82,9 @@ stof_doctrine_extensions:
             translatable:     true
             tree:             true
 
-services:
-    twig.extension.intl:
-        class:               Twig_Extensions_Extension_Intl
-        tags:
-            - { name: twig.extension }
-
 oro_translation:
-    locales: [en, fr]
-    templating: "OroUIBundle:Form:translatable.html.twig"
+    locales:                  [en, fr]
+    templating:               "OroUIBundle:Form:translatable.html.twig"
 
 lexik_maintenance:
     authorized:
@@ -134,8 +129,14 @@ oro_locale:
 
 oro_attachment:
     upload_file_mime_types:
+        - text/csv
+        - text/plain
         - application/msword
+        - application/vnd.openxmlformats-officedocument.wordprocessingml.document
         - application/vnd.ms-excel
+        - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+        - application/vnd.ms-powerpoint
+        - application/vnd.openxmlformats-officedocument.presentationml.presentation
         - application/pdf
         - application/zip
         - image/gif
 
@@ -6,6 +6,7 @@ parameters:
     database_user:      root
     database_password:  ~
     database_driver_options: []
+    database_server_version: ~
 
     mailer_transport:   smtp
     mailer_host:        127.0.0.1
@@ -57,3 +58,7 @@ parameters:
     message_queue_transport: 'dbal'
     message_queue_transport_config: ~
     deployment_type: ~
+
+    # Post processors binary
+    liip_imagine.jpegoptim.binary: null
+    liip_imagine.pngquant.binary: null
@@ -6,6 +6,7 @@ parameters:
     database_user:          root
     database_password:      ~
     database_driver_options: []
+    database_server_version: ~
 
     mailer_transport:       smtp
     mailer_host:            127.0.0.1
@@ -53,3 +54,7 @@ parameters:
     message_queue_transport: 'null'
     message_queue_transport_config: {}
     deployment_type: ~
+
+    # Post processors binary
+    liip_imagine.jpegoptim.binary: null
+    liip_imagine.pngquant.binary: null
@@ -1,8 +1,3 @@
 security:
     encoders:
-        Symfony\Component\Security\Core\User\User: plaintext
-
-    firewalls:
-        dev:
-            pattern:  ^/(_(profiler|wdt)|css|images|js)/
-            security: false
+        Symfony\Component\Security\Core\User\User: plaintext