Merge remote-tracking branch 'remotes/dev/4.2' into 4.2

Author: CI bot

composer.json

@@ -60,7 +60,7 @@
     "symfony/var-dumper": "4.4.18",
     "symfony/var-exporter": "4.4.18",
     "symfony/web-profiler-bundle": "4.4.18",
-    "theofidry/alice-data-fixtures": "1.0.*"
+    "theofidry/alice-data-fixtures": "~1.4.0"
   },
   "config": {
     "bin-dir": "bin",

config/config_test.yml

@@ -23,6 +23,8 @@ monolog:
             type: fingers_crossed
             action_level: error
             handler: nested
+            excluded_http_codes: [ 404, 405 ]
+            channels: [ "!event" ]
         nested:
             type: stream
             path: "%kernel.logs_dir%/%kernel.environment%.log"

config/parameters.yml.dist

@@ -5,6 +5,7 @@ parameters:
     database_name:          '%env(ORO_DB_NAME)%'
     database_user:          '%env(ORO_DB_USER)%'
     database_password:      '%env(ORO_DB_PASSWORD)%'
+    database_server_version: '%env(ORO_DB_VERSION)%'
     database_driver_options: []
 
     mailer_transport:       '%env(ORO_MAILER_DRIVER)%'
@@ -55,6 +56,7 @@ parameters:
     env(ORO_DB_NAME): b2b_crm_dev
     env(ORO_DB_USER): root
     env(ORO_DB_PASSWORD): null
+    env(ORO_DB_VERSION): null
 
     env(ORO_MAILER_DRIVER): sendmail
     env(ORO_MAILER_HOST): 127.0.0.1

config/parameters_test.yml.dist

@@ -5,6 +5,7 @@ parameters:
     database_name:          '%env(ORO_DB_NAME)%'
     database_user:          '%env(ORO_DB_USER)%'
     database_password:      '%env(ORO_DB_PASSWORD)%'
+    database_server_version: '%env(ORO_DB_VERSION)%'
     database_driver_options: []
 
     mailer_transport:       '%env(ORO_MAILER_DRIVER)%'
@@ -51,6 +52,7 @@ parameters:
     env(ORO_DB_NAME): b2b_crm_dev_test
     env(ORO_DB_USER): root
     env(ORO_DB_PASSWORD): null
+    env(ORO_DB_VERSION): null
 
     env(ORO_MAILER_DRIVER): smtp
     env(ORO_MAILER_HOST): 127.0.0.1

dev.json

@@ -51,7 +51,7 @@
     "behat/mink-selenium2-driver": "~1.4.0",
     "behat/symfony2-extension": "~2.1.5",
     "nelmio/alice": "~3.8.0",
-    "theofidry/alice-data-fixtures": "1.0.*",
+    "theofidry/alice-data-fixtures": "~1.4.0",
     "phpunit/phpunit": "~9.5.1",
     "johnkary/phpunit-speedtrap": "~3.3.0",
     "squizlabs/php_codesniffer": "3.5.*",