marellocommerce
diff --git a/‎.gitignore
+6-4 b/‎.gitignore
+6-4
diff --git a/‎README.md
+3-4 b/‎README.md
+3-4
diff --git a/‎UPGRADE.md
+6-1 b/‎UPGRADE.md
+6-1
diff --git a/‎bin/security-checker
-1 b/‎bin/security-checker
-1
diff --git a/‎composer.json
+28-16 b/‎composer.json
+28-16
diff --git a/‎config/config.yml
+13-32 b/‎config/config.yml
+13-32
diff --git a/‎config/config_dev.yml
+20-4 b/‎config/config_dev.yml
+20-4
diff --git a/‎config/config_prod.yml
+11-2 b/‎config/config_prod.yml
+11-2
diff --git a/‎config/config_test.yml
+8-3 b/‎config/config_test.yml
+8-3
@@ -21,27 +21,29 @@ behat.yml
 /var/import_export/*
 !var/import_export/.gitkeep
 !var/oro-check.php
+!var/SymfonyRequirements.php
 !var/OroRequirements.php
 /vendor
-node_modules/
 build/
 /cov
 /public/bundles
 /public/css
 /public/js
+/public/build
+/public/layout-build
 /public/uploads/users/*
 /public/media/cache
 /public/media/js
 /public/build.js
 /config/parameters.yml
 /config/parameters_test.yml
-behat.yml
 *~
 bin/*
 !bin/console
 !bin/dist
 phpunit.xml
-/var/SymfonyRequirements.php
 /public/uploads/behat
 /.web-server-pid
-/.vagrant
+/.vagrant
+/node_modules
+package.json
@@ -8,17 +8,16 @@ using Marello.
 
 ## Requirements
 
-Marello is a Symfony 3.4 based application with the following requirements:
+Marello is a Symfony 4.4 based application with the following requirements:
 
-* PHP 7.1.26 or above with command line interface
+* PHP 7.3.13 or above with command line interface
 * PHP Extensions
     * Ctype
     * Fileinfo
     * GD 2.0 and above
     * Intl (ICU library 4.4 and above)
     * JSON
     * Mbstring
-    * Mcrypt
     * Mysql
     * PCRE 8.0 and above
     * SimpleXML
@@ -45,7 +44,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] installed
+- Make sure that you have [NodeJS][3] >=12.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:
 
 
@@ -4,7 +4,7 @@ UPGRADE NOTES
 This upgrade sequence has been derived from the Oro(CRM/Commerce). More information can be found at https://oroinc.com/orocrm/doc/current/install-upgrade/upgrade[1]
 for more details.
 
-### Recommended upgrade sequence to Marello 2.1
+### Recommended upgrade sequence to Marello 3.0
 To retrieve source code of a new version and upgrade your Marello instance, please execute the following steps:
 
   * Go to the Marello root folder and switch the application to the maintenance mode;
@@ -26,6 +26,11 @@ crontab -e -uwww-data
   * Stop all running consumers;
   * Create backups of your database and source code;
   * Pull changes from the repository;
+  
+####Update sequence to 3.0 additional step(s)
+If you are going to upgrade from a Marello version lower than 2.2.x, please update to the latest 2.2.x version first!
+This allows you to transition to 3.0 more easily and prevent issues during install. This step **is** necessary for a smooth transition during the changes made from the old Customer and new Customer
+
 ```bash
 git pull
 git checkout <VERSION TO UPGRADE>
 
@@ -1,8 +1,14 @@
 {
     "name": "marellocommerce/marello-application",
-    "description": "Marello Unified Commerce Management distribution",
+    "description": "Marello Unified Commerce Management Community Edition",
     "homepage": "https://github.com/marellocommerce/marello-application.git",
     "license": "OSL-3.0",
+    "authors": [
+        {
+            "name": "Marello B.V.",
+            "homepage": "https://www.marello.com"
+        }
+    ],
     "autoload": {
         "psr-4": {"": "src/"},
         "classmap": [
@@ -27,27 +33,30 @@
         }
     },
     "require": {
-        "oro/platform": "~3.1.1",
-        "oro/platform-serialised-fields": "~3.1.1",
-        "oro/calendar-bundle": "~3.1.1",
-        "marellocommerce/marello": "~2.1.0"
+        "oro/platform": "4.1.*",
+        "oro/platform-serialised-fields": "4.1.*",
+        "oro/calendar-bundle": "4.1.*",
+        "marellocommerce/marello": "~3.1.0"
     },
     "require-dev": {
-        "sensio/generator-bundle": "3.1.*",
         "behat/behat": "3.4.*",
+        "behat/gherkin": "4.6.0",
+        "behat/mink": "dev-master#6d637f7af4816c26ad8a943da2e3f7eef1231bea",
         "behat/mink-extension": "2.3.*",
-        "behat/mink-selenium2-driver": "1.*",
+        "behat/mink-selenium2-driver": "1.3.1",
         "behat/symfony2-extension": "2.1.*",
-        "nelmio/alice": "2.3.*",
-        "phpunit/phpunit": "6.5.*",
-        "johnkary/phpunit-speedtrap": "2.0.*",
-        "mybuilder/phpunit-accelerator": "2.0.*",
-        "squizlabs/php_codesniffer": "3.3.*",
+        "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",
+        "squizlabs/php_codesniffer": "3.5.*",
         "phpmd/phpmd": "2.6.*",
-        "sebastian/phpcpd": "3.0.*",
-        "phpunit/phpcov": "4.0.*",
-        "symfony/phpunit-bridge": "3.4.*",
-        "friendsofphp/php-cs-fixer": "2.12.*",
+        "sebastian/phpcpd": "4.0.*",
+        "phpunit/phpcov": "5.0.*",
+        "symfony/phpunit-bridge": "4.4.*",
+        "friendsofphp/php-cs-fixer": "2.16.*",
         "oro/twig-inspector": "1.0.*"
     },
     "config": {
@@ -96,6 +105,9 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {
+        "symfony": {
+            "require": "4.4.*"
+        },
         "symfony-web-dir": "public",
         "symfony-var-dir": "var",
         "symfony-bin-dir": "bin",
 
@@ -18,12 +18,12 @@ framework:
     templating:
         engines: ['twig', 'php']
     assets:
-        version: %assets_version%
-        version_format: %%s?version=%%s
-    default_locale:           "en"
+        version: '%assets_version%'
+        version_format: '%%s?version=%%s'
+    default_locale: en
     session:
-        name:                 BAPID
-        handler_id:           %session_handler%
+        name:                 MARELLOID
+        handler_id:           '%session_handler%'
         save_path:            '%kernel.project_dir%/var/sessions/%kernel.environment%'
         gc_maxlifetime:       3600
         cookie_httponly:      true
@@ -87,9 +87,6 @@ services:
          tags:
              - { name: twig.extension }
 
-escape_wsse_authentication:
-    authentication_provider_class: Oro\Bundle\UserBundle\Security\WsseAuthProvider
-
 oro_translation:
     locales: [en, fr]
     templating: "OroUIBundle:Form:translatable.html.twig"
@@ -101,50 +98,30 @@ lexik_maintenance:
     driver:
         class:                Lexik\Bundle\MaintenanceBundle\Drivers\FileDriver
         options:
-            file_path:        %kernel.project_dir%/var/cache/maintenance_lock
+            file_path:        '%kernel.project_dir%/var/cache/maintenance_lock'
 
 liip_imagine:
     loaders:
         default:
             filesystem:
-                data_root: %kernel.project_dir%/public
+                data_root: '%kernel.project_dir%/public'
     resolvers:
         default:
             web_path:
-                web_root: %kernel.project_dir%/public
+                web_root: '%kernel.project_dir%/public'
 
 #
 # ORO Bundles config
 #
 oro_distribution:
     entry_point: ~
 
-oro_require_js:
-    build_path:               "js/oro.min.js"
-    build_timeout:            3600
-    build:
-        preserveLicenseComments: true
-
-oro_help:
-    defaults:
-        server: http://help.orocrm.com/
-        prefix: Third_Party
-    vendors:
-        Oro:
-            prefix: ~
-            alias: Platform
-    routes:
-        oro_default:
-            uri: Platform/OroDashboardBundle
-
 oro_theme:
     active_theme: oro
 
 oro_message_queue:
     transport:
-        default: '%message_queue_transport%'
         '%message_queue_transport%': '%message_queue_transport_config%'
-    client: ~
 
 oro_locale:
     formatting_code: en
@@ -159,7 +136,11 @@ oro_attachment:
         - image/gif
         - image/jpeg
         - image/png
+        - image/svg
+        - image/svg+xml
     upload_image_mime_types:
         - image/gif
         - image/jpeg
-        - image/png
+        - image/png
+        - image/svg
+        - image/svg+xml
@@ -1,6 +1,9 @@
 imports:
     - { resource: config.yml }
 
+parameters:
+    main_log_channels: []
+
 framework:
     router:   { resource: "%kernel.project_dir%/config/routing_dev.yml" }
     profiler: { only_exceptions: false }
@@ -14,13 +17,26 @@ web_profiler:
 monolog:
     handlers:
         main:
-            type:  stream
-            path:  "%kernel.logs_dir%/%kernel.environment%.log"
-            level: debug
+            type:      stream
+            path:      "%kernel.logs_dir%/%kernel.environment%.log"
+            level:     debug
+            channels:  '%main_log_channels%'
+
+        # collect all log records to buffer on CLI command error
+        message_queue.consumer.console_error:
+            type:      service
+            id:        oro_message_queue.log.handler.console_error
+            handler:   main
+            level:     debug
 
 oro_message_queue:
     client:
         traceable_producer: true
 
 #swiftmailer:
-#    delivery_address: [email protected]
+#    delivery_addresses: ['[email protected]']
+
+oro_api:
+    settings:
+        web_api:
+            value: true
@@ -1,6 +1,9 @@
 imports:
     - { resource: config.yml }
 
+parameters:
+    main_log_channels: []
+
 #doctrine:
 #    orm:
 #        metadata_cache_driver: apc
@@ -17,10 +20,12 @@ monolog:
             type:           service
             id:             oro_logger.monolog.detailed_logs.handler
             handler:        nested
+            channels:       '%main_log_channels%'
         nested:
             type:           stream
             path:           "%kernel.logs_dir%/%kernel.environment%.log"
             level:          debug
+            channels:       '%main_log_channels%'
 
         fingers_crossed:
             type:           fingers_crossed
@@ -40,5 +45,9 @@ monolog:
             level:          debug
             formatter:      monolog.formatter.html
 
-oro_require_js:
-    build_logger: false
+        # collect all log records to buffer on CLI command error
+        message_queue.consumer.console_error:
+            type:           service
+            id:             oro_message_queue.log.handler.console_error
+            handler:        nested
+            level:          debug
@@ -5,6 +5,9 @@ imports:
 
 parameters:
     doctrine.dbal.connection_factory.class: 'Oro\Component\Testing\Doctrine\PersistentConnectionFactory'
+    message_queue_transport: 'dbal'
+    message_queue_transport_config: {}
+    main_log_channels: []
 
 framework:
     test: ~
@@ -24,6 +27,7 @@ monolog:
             type: stream
             path: "%kernel.logs_dir%/%kernel.environment%.log"
             level: debug
+            channels: '%main_log_channels%'
 
 services:
     oro_message_queue.test.message_collector:
@@ -54,6 +58,7 @@ twig:
     strict_variables: true
     debug: false
 
-oro_message_queue:
-    transport:
-        dbal: null
+oro_api:
+    settings:
+        web_api:
+            value: true