Merge remote-tracking branch 'origin/master' into epic/ORO-845_expres…

…sion_editor # Conflicts: # application/commerce-crm-de/dev.lock # application/commerce-crm-de/package-lock.json # application/commerce-crm-ee-de/dev.lock # application/commerce-crm-ee-de/package-lock.json # application/commerce-crm-ee/dev.lock # application/commerce-crm-ee/package-lock.json # application/commerce-crm/dev.lock # application/commerce-crm/package-lock.json # application/commerce-demo/dev.lock # application/commerce-demo/package-lock.json # application/commerce-enterprise/dev.lock # application/commerce-enterprise/package-lock.json # application/commerce/dev.lock # application/commerce/package-lock.json # application/crm-demo/dev.lock # application/crm-demo/package-lock.json # application/crm-enterprise/dev.lock # application/crm-enterprise/package-lock.json # application/crm/dev.lock # application/crm/package-lock.json # application/platform/dev.lock # application/platform/package-lock.json # package/commerce/CHANGELOG.md # package/commerce/dev.lock # package/commerce/src/Oro/Bundle/PricingBundle/Tests/Unit/Form/OptionsConfigurator/PriceRuleEditorOptionsConfiguratorTest.php # package/commerce/src/Oro/Bundle/PricingBundle/Tests/Unit/Form/Type/PriceRuleEditorAwareTestTrait.php # package/commerce/src/Oro/Bundle/ProductBundle/Tests/Unit/Expression/Autocomplete/AbstractFieldsProviderTest.php # package/commerce/src/Oro/Bundle/ProductBundle/Tests/Unit/Expression/Autocomplete/AutocompleteFieldsProviderTest.php # package/commerce/src/Oro/Bundle/ProductBundle/Tests/Unit/Twig/ProductExtensionTest.php # package/crm/dev.lock # package/platform/CHANGELOG.md # package/platform/dev.lock
Janvdv · May 3, 2023 · 30f99ae · 30f99ae
2 parents c40a0dd + fe5d3cc
commit 30f99ae
Show file tree

Hide file tree

Showing 3,727 changed files with 75,629 additions and 56,543 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/bin/oro-form-alias-checker b/bin/oro-form-alias-checker
@@ -20,11 +20,7 @@ function createConnection(): \Doctrine\DBAL\Connection
     $configParams = $configParams['parameters'];
 
     return \Doctrine\DBAL\DriverManager::getConnection([
-        'dbname' => $configParams['database_name'],
-        'user' => $configParams['database_user'],
-        'password' => $configParams['database_password'],
-        'host' => $configParams['database_host'],
-        'driver' => $configParams['database_driver']
+        'url' => $configParams['database_dsn'],
     ], $config);
 }
 

diff --git a/bootstrap_test.php b/bootstrap_test.php
@@ -0,0 +1,7 @@
+<?php
+
+use Oro\Bundle\EntityExtendBundle\Test\EntityExtendTestInitializer;
+
+require __DIR__.'/vendor/autoload.php';
+
+EntityExtendTestInitializer::initialize();
diff --git a/build/.php-cs-fixer.php b/build/.php-cs-fixer.php
@@ -6,6 +6,7 @@
     ->files()
     ->name('*.php')
     ->notName('*.php.twig')
+    ->notName('ClientController.php') // braces rule, multiline function declaration ending with "): callable {"
     ->notName('OroKernel.php');
 
 // https://github.com/mlocati/php-cs-fixer-configurator

diff --git a/build/phpunit_app.xml.dist b/build/phpunit_app.xml.dist
@@ -48,8 +48,8 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="SYMFONY_ENV" value="test"/>
-        <env name="SYMFONY_DEBUG" value="0"/>
+        <env name="ORO_ENV" value="test"/>
+        <env name="ORO_DEBUG" value="0"/>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
         <ini name="error_reporting" value="-1"/>
         <ini name="memory_limit" value="-1"/>

diff --git a/build/phpunit_package.xml.dist b/build/phpunit_package.xml.dist
@@ -37,8 +37,8 @@
     </testsuites>
 
     <php>
-        <env name="SYMFONY_ENV" value="test"/>
-        <env name="SYMFONY_DEBUG" value="0"/>
+        <env name="ORO_ENV" value="test"/>
+        <env name="ORO_DEBUG" value="0"/>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
         <ini name="error_reporting" value="-1"/>
         <ini name="memory_limit" value="-1"/>

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "~8.1.0",
+        "php": "~8.2.0",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-gd": "*",
@@ -29,47 +29,50 @@
         "composer/semver": "~3.3.2",
         "psr/container": "^1.0",
         "psr/simple-cache": "3.0.*",
-        "symfony/asset": "~5.4.0",
-        "symfony/cache": "5.4.3",
-        "symfony/config": "~5.4.0",
-        "symfony/console": "5.4.3",
-        "symfony/dependency-injection": "5.4.3",
-        "symfony/doctrine-bridge": "5.4.3",
-        "symfony/error-handler": "~5.4.0",
-        "symfony/event-dispatcher": "~5.4.0",
-        "symfony/expression-language": "~5.4.0",
-        "symfony/filesystem": "5.4.3",
-        "symfony/finder": "~5.4.0",
-        "symfony/form": "5.4.3",
-        "symfony/framework-bundle": "5.4.4",
-        "symfony/http-client": "5.4.3",
-        "symfony/http-foundation": "5.4.3",
-        "symfony/http-kernel": "5.4.4",
-        "symfony/string": "~5.4.0",
-        "symfony/intl": "5.4.3",
-        "symfony/lock": "5.4.3",
-        "symfony/mime": "~5.4.0",
-        "symfony/monolog-bridge": "~5.4.0",
-        "symfony/options-resolver": "~5.4.0",
-        "symfony/process": "5.4.3",
-        "symfony/property-access": "5.4.3",
-        "symfony/property-info": "~5.4.0",
-        "symfony/proxy-manager-bridge": "~5.4.0",
-        "symfony/routing": "~5.4.0",
-        "symfony/security-core": "5.4.3",
-        "symfony/security-csrf": "~5.4.0",
-        "symfony/security-guard": "~5.4.0",
-        "symfony/security-http": "5.4.3",
-        "symfony/security-bundle": "5.4.3",
-        "symfony/serializer": "5.4.3",
-        "symfony/templating": "~5.4.0",
-        "symfony/translation": "5.4.3",
-        "symfony/twig-bridge": "5.4.3",
-        "symfony/twig-bundle": "~5.4.0",
-        "symfony/validator": "5.4.3",
-        "symfony/web-link": "~5.4.0",
-        "symfony/yaml": "~5.4.0",
-        "symfony/mailer": "5.4.3",
+        "symfony/asset": "~5.4.13",
+        "symfony/cache": "~5.4.18",
+        "symfony/config": "~5.4.11",
+        "symfony/console": "~5.4.17",
+        "symfony/dependency-injection": "~5.4.17",
+        "symfony/doctrine-bridge": "~5.4.17",
+        "symfony/dotenv": "~5.4.19",
+        "symfony/error-handler": "~5.4.17",
+        "symfony/event-dispatcher": "~5.4.17",
+        "symfony/expression-language": "~5.4.14",
+        "symfony/filesystem": "~5.4.13",
+        "symfony/finder": "~5.4.17",
+        "symfony/form": "~5.4.17",
+        "symfony/flex": "2.2.0",
+        "symfony/framework-bundle": "~5.4.17",
+        "symfony/http-client": "~5.4.17",
+        "symfony/http-foundation": "~5.4.17",
+        "symfony/http-kernel": "~5.4.18",
+        "symfony/string": "~5.4.17",
+        "symfony/intl": "~5.4.15",
+        "symfony/lock": "~5.4.15",
+        "symfony/mime": "~5.4.17",
+        "symfony/monolog-bridge": "~5.4.17",
+        "symfony/options-resolver": "~5.4.11",
+        "symfony/process": "~5.4.11",
+        "symfony/property-access": "~5.4.15",
+        "symfony/property-info": "~5.4.17",
+        "symfony/proxy-manager-bridge": "~5.4.6",
+        "symfony/routing": "~5.4.17",
+        "symfony/runtime": "~5.4.19",
+        "symfony/security-core": "~5.4.15",
+        "symfony/security-csrf": "~5.4.11",
+        "symfony/security-guard": "~5.4.13",
+        "symfony/security-http": "~5.4.17",
+        "symfony/security-bundle": "~5.4.17",
+        "symfony/serializer": "~5.4.17",
+        "symfony/templating": "~5.4.11",
+        "symfony/translation": "~5.4.14",
+        "symfony/twig-bridge": "~5.4.17",
+        "symfony/twig-bundle": "~5.4.17",
+        "symfony/validator": "~5.4.17",
+        "symfony/web-link": "~5.4.3",
+        "symfony/yaml": "~5.4.17",
+        "symfony/mailer": "~5.4.17",
         "symfony/cache-contracts": "^2.1",
         "symfony/deprecation-contracts": "^2.1",
         "symfony/event-dispatcher-contracts": "^2.1",
@@ -79,79 +82,78 @@
         "symfony/polyfill-ctype": "1.24.0",
         "symfony/security-acl": "~3.2.0",
         "symfony/acl-bundle": "~2.2.0",
-        "twig/twig": "~3.4.3",
-        "doctrine/orm": "2.10.2",
-        "doctrine/doctrine-bundle": "~2.5.0",
-        "doctrine/dbal": "2.13.7",
-        "doctrine/annotations": "~1.13.2",
+        "twig/twig": "~3.5.0",
+        "doctrine/orm": "~2.14.0",
+        "doctrine/doctrine-bundle": "~2.7.2",
+        "doctrine/dbal": "~2.13.9",
+        "doctrine/annotations": "~1.14.2",
         "doctrine/data-fixtures": "^1.4.3",
         "doctrine/doctrine-fixtures-bundle": "^3.3.1",
-        "doctrine/collections": "~1.6.8",
-        "doctrine/persistence": "~2.3.0",
+        "doctrine/collections": "~1.8.0",
+        "doctrine/persistence": "~2.5.5",
         "symfony/monolog-bundle": "~3.7.0",
         "sensio/framework-extra-bundle": "~6.2.6",
-        "incenteev/composer-parameter-handler": "2.1.*",
         "knplabs/knp-menu": "~3.3.0",
         "knplabs/knp-menu-bundle": "~3.2.0",
-        "friendsofsymfony/rest-bundle": "~3.0.5",
-        "friendsofsymfony/jsrouting-bundle": "2.7.*",
+        "friendsofsymfony/rest-bundle": "~3.5.0",
+        "friendsofsymfony/jsrouting-bundle": "3.2.*",
         "oro/api-doc-bundle": "2.0.0",
-        "nelmio/security-bundle": "~2.10.2",
+        "nelmio/security-bundle": "~3.0.0",
         "ass/xmlsecurity": "1.1.1",
         "stof/doctrine-extensions-bundle": "~1.7.0",
-        "liip/imagine-bundle": "~2.7.6",
-        "laminas/laminas-mail": "^2.12.0",
-        "dragonmantank/cron-expression": "~3.1.0",
-        "gos/web-socket-bundle": "~3.14.0",
-        "guzzlehttp/guzzle": "~7.4.5",
+        "liip/imagine-bundle": "~2.10.0",
+        "laminas/laminas-mail": "~2.22.0",
+        "dragonmantank/cron-expression": "~3.3.2",
+        "gos/web-socket-bundle": "~3.15.0",
+        "guzzlehttp/guzzle": "~7.5.0",
         "guzzlehttp/psr7": "~2.4.0",
-        "nesbot/carbon": "~2.55.2",
-        "monolog/monolog": "~2.3.5",
+        "nesbot/carbon": "~2.65.0",
+        "monolog/monolog": "~2.8.0",
         "ocramius/proxy-manager": "~2.11.1",
-        "knplabs/knp-gaufrette-bundle": "~0.7.1",
+        "knplabs/knp-gaufrette-bundle": "~0.8.0",
         "oro/doctrine-extensions": "~2.0.2",
-        "ezyang/htmlpurifier": "~4.14.0",
+        "ezyang/htmlpurifier": "~4.16.0",
         "xemlock/htmlpurifier-html5": "0.1.10",
         "hwi/oauth-bundle": "~1.4.2",
         "kriswallsmith/buzz": "~1.2.0",
-        "matomo/device-detector": "~5.0.3",
+        "matomo/device-detector": "~6.0.6",
         "symfony/polyfill-php70": "1.*",
         "box/spout": "~3.3.0",
-        "nette/php-generator": "~3.6.2",
-        "brick/math": "~0.9.2",
+        "nette/php-generator": "~4.0.5",
+        "brick/math": "~0.11.0",
         "phpdocumentor/reflection-docblock": "5.3.*",
-        "php-http/httplug-bundle": "~1.25.0",
+        "php-http/httplug-bundle": "~1.27.0",
         "salsify/json-streaming-parser": "8.2.*",
-        "myclabs/deep-copy": "1.10.*",
-        "oro/redis-config": "5.1.*",
+        "myclabs/deep-copy": "1.11.*",
         "symfony/requirements-checker": "^2.0.0",
-        "gedmo/doctrine-extensions": "3.5.0",
-        "symfony/flex": "2.2.0"
+        "gedmo/doctrine-extensions": "~3.10.0",
+        "predis/predis": "~1.1.6",
+        "psr/log": "1.1.*"
     },
     "require-dev": {
-        "behat/behat": "~3.10.0",
+        "behat/behat": "~3.12.0",
         "behat/gherkin": "~4.9.0",
-        "behat/mink": "~1.9.0",
-        "friends-of-behat/mink-extension": "~v2.5.0",
-        "behat/mink-selenium2-driver": "~1.5.0",
-        "friends-of-behat/symfony-extension": "~2.2.0",
-        "nelmio/alice": "~3.9.0",
-        "theofidry/alice-data-fixtures": "~1.4.0",
-        "phpunit/phpunit": "9.5.13",
-        "johnkary/phpunit-speedtrap": "~4.0.0",
-        "squizlabs/php_codesniffer": "~3.6.0",
-        "phpmd/phpmd": "~2.11.1",
-        "sebastian/phpcpd": "6.0.*",
-        "symfony/phpunit-bridge": "~5.4.0",
-        "symfony/browser-kit": "~5.4.0",
-        "symfony/css-selector": "~5.4.0",
-        "symfony/debug-bundle": "~5.4.0",
-        "symfony/dom-crawler": "~5.4.0",
-        "symfony/stopwatch": "~5.4.0",
-        "symfony/var-dumper": "~5.4.0",
-        "symfony/var-exporter": "~5.4.0",
-        "symfony/web-profiler-bundle": "~5.4.0",
-        "friendsofphp/php-cs-fixer": "~3.4.0",
+        "behat/mink": "~1.10.0",
+        "friends-of-behat/mink-extension": "~v2.7.2",
+        "behat/mink-selenium2-driver": "~1.6.0",
+        "friends-of-behat/symfony-extension": "~2.4.0",
+        "nelmio/alice": "~3.12.1",
+        "theofidry/alice-data-fixtures": "~1.6.0",
+        "phpunit/phpunit": "~9.5.27",
+        "johnkary/phpunit-speedtrap": "~4.0.1",
+        "squizlabs/php_codesniffer": "~3.7.1",
+        "phpmd/phpmd": "~2.13.0",
+        "sebastian/phpcpd": "~6.0.3",
+        "symfony/phpunit-bridge": "~5.4.17",
+        "symfony/browser-kit": "~5.4.11",
+        "symfony/css-selector": "~5.4.17",
+        "symfony/debug-bundle": "~5.4.11",
+        "symfony/dom-crawler": "~5.4.17",
+        "symfony/stopwatch": "~5.4.13",
+        "symfony/var-dumper": "~5.4.17",
+        "symfony/var-exporter": "~5.4.17",
+        "symfony/web-profiler-bundle": "~5.4.17",
+        "friendsofphp/php-cs-fixer": "~3.13.1",
         "oro/twig-inspector": "1.0.*"
     },
     "provide": {
@@ -175,25 +177,25 @@
             "colors": "1.4.0",
             "moment": "2.29.*",
             "moment-timezone": "0.5.*",
-            "jstree": "3.3.*",
+            "jstree": "3.3.12",
             "jquery.cookie": "1.4.1",
             "when": "3.7.8",
             "crypto-js": "4.1.1",
             "jquery-mousewheel": "3.1.13",
             "jquery-numeric": "1.5.0",
-            "tinymce": "5.10.*",
-            "timepicker": "1.13.18",
+            "tinymce": "6.3.*",
+            "timepicker": "1.14.0",
             "datepair.js": "0.4.*",
             "jquery-ui-multiselect-widget": "2.0.1",
-            "autolinker": "3.14.3",
+            "autolinker": "4.0.0",
             "Base64": "1.1.0",
             "flotr2": "0.1.0",
             "bean": "1.0.15",
             "jquery-validation": "1.19.5",
             "backgrid": "0.3.8",
             "numeral": "2.0.6",
             "jquery-form": "4.3.0",
-            "fuse.js": "6.4.6",
+            "fuse.js": "6.6.2",
             "jquery": "3.5.*",
             "jquery-ui": "1.13.*",
             "backbone": "1.4.*",
@@ -204,18 +206,18 @@
             "@oroinc/bootstrap": "4.3.1-oro2",
             "popper.js": "1.16.1",
             "asap": "2.0.6",
-            "slick-carousel": "1.7.1",
-            "xregexp": "5.1.0",
+            "@oroinc/slick-carousel": "1.7.1-oro1",
+            "xregexp": "^5.1.0",
             "scriptjs": "2.5.9",
             "focus-visible": "5.2.0",
             "@oroinc/jquery-ajax-queue": "0.0.1",
             "@oroinc/jsplumb": "1.7.*",
             "@oroinc/select2": "3.4.1",
             "@oroinc/autobahnjs": "0.8.0",
-            "@oroinc/backbone.pageable": "1.2.3-oro1",
+            "@oroinc/backbone.pageable": "1.2.3-oro2",
             "@oroinc/jquery.nicescroll": "3.6.6",
             "@babel/runtime": "^7.16.3",
-            "core-js": "3.25.*"
+            "core-js": "^3.25.*"
         },
         "symfony": {
             "require": "~5.4.0"
@@ -278,6 +280,7 @@
             "Oro\\Bundle\\OrganizationBundle\\": "src/Oro/Bundle/OrganizationBundle",
             "Oro\\Bundle\\PlatformBundle\\": "src/Oro/Bundle/PlatformBundle",
             "Oro\\Bundle\\QueryDesignerBundle\\": "src/Oro/Bundle/QueryDesignerBundle",
+            "Oro\\Bundle\\RedisConfigBundle\\": "src/Oro/Bundle/RedisConfigBundle",
             "Oro\\Bundle\\ReminderBundle\\": "src/Oro/Bundle/ReminderBundle",
             "Oro\\Bundle\\ReportBundle\\": "src/Oro/Bundle/ReportBundle",
             "Oro\\Bundle\\ScopeBundle\\": "src/Oro/Bundle/ScopeBundle",
@@ -319,5 +322,12 @@
             "Oro\\Component\\TestUtils\\": "src/Oro/Component/TestUtils"
         },
         "exclude-from-classmap": ["/Tests/"]
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": false,
+            "symfony/runtime": false,
+            "symfony/flex": false
+        }
     }
 }