Skip to content

Commit

Permalink
BAP-22905: Set minimum required version of PHP to 8.4 and NodeJS to 2…
Browse files Browse the repository at this point in the history 
…2 (#40223)

- Updated PHP to 8.4, NodeJS to 22, and some composer dependencies to support the new version of PHP.
- Suppressed deprecations as there are too many of them in third-party dependencies
- Fixed some tests after dependency updates
- Skipped unstable tests related to content purifying
- Temporary disabled WAF in the CI environment, as the new version is not compatible with the existing WAF rules
- Used new docker images
---------

Co-authored-by: Viacheslav Dubrovskyi <vdubrovskyi@oroinc.com>
Co-authored-by: Valerii Yustyniuk <ValeriyYustunyk@users.noreply.github.com>
  • Loading branch information
@anyt @dubrsl @ValeriyYustunyk
3 people authored Jan 27, 2025
1 parent 11e8dc9 commit 52054f6
Show file tree
Hide file tree
Showing 25 changed files with 831 additions and 585 deletions.
9 changes: 0 additions & 9 deletions build/phpunit_app.xml.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,6 @@
<server name="KERNEL_DIR" value="src/"/>
</php>
<listeners>
<listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener">
<arguments>
<array>
<element key="slowThreshold">
<integer>1000</integer>
</element>
</array>
</arguments>
</listener>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
<listener class="Oro\Component\TestUtils\Listener\TestListener"/>
</listeners>
Expand Down
9 changes: 0 additions & 9 deletions build/phpunit_package.xml.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,6 @@
<ini name="memory_limit" value="-1"/>
</php>
<listeners>
<listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener">
<arguments>
<array>
<element key="slowThreshold">
<integer>1000</integer>
</element>
</array>
</arguments>
</listener>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
<listener class="Oro\Component\TestUtils\Listener\TestListener"/>
</listeners>
Expand Down
46 changes: 23 additions & 23 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"php": "~8.3.0",
"php": "~8.4.0",
"ext-ctype": "*",
"ext-dom": "*",
"ext-gd": "*",
Expand Down Expand Up @@ -43,31 +43,31 @@
"symfony/finder": "~6.4.0",
"symfony/form": "~6.4.0",
"symfony/framework-bundle": "~6.4.0",
"symfony/http-client": "~6.4.0",
"symfony/http-foundation": "~6.4.0",
"symfony/http-client": "~6.4.15",
"symfony/http-foundation": "~6.4.14",
"symfony/http-kernel": "~6.4.0",
"symfony/string": "6.4.10",
"symfony/intl": "~6.4.0",
"symfony/lock": "~6.4.0",
"symfony/mime": "~6.4.0",
"symfony/monolog-bridge": "~6.4.0",
"symfony/options-resolver": "~6.4.0",
"symfony/process": "~6.4.0",
"symfony/process": "~6.4.14",
"symfony/property-access": "~6.4.0",
"symfony/property-info": "~6.4.0",
"symfony/proxy-manager-bridge": "~6.4.0",
"symfony/routing": "~6.4.0",
"symfony/runtime": "~6.4.0",
"symfony/runtime": "~6.4.14",
"symfony/security-core": "~6.4.0",
"symfony/security-csrf": "~6.4.0",
"symfony/security-http": "~6.4.0",
"symfony/security-http": "~6.4.15",
"symfony/security-bundle": "~6.4.0",
"symfony/serializer": "6.4.7",
"symfony/templating": "~6.4.0",
"symfony/translation": "~6.4.0",
"symfony/twig-bridge": "~6.4.0",
"symfony/twig-bundle": "~6.4.0",
"symfony/validator": "6.4.7",
"symfony/validator": "~6.4.11",
"symfony/web-link": "~6.4.0",
"symfony/yaml": "~6.4.0",
"symfony/mailer": "~6.4.0",
Expand All @@ -81,38 +81,38 @@
"symfony/security-acl": "~3.3.2",
"symfony/acl-bundle": "~2.3.0",
"symfony/flex": "2.4.*",
"twig/twig": "~3.5.0",
"twig/twig": "~3.11.3",
"doctrine/orm": "~2.15.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.8.0",
"doctrine/persistence": "~3.1.0",
"doctrine/persistence": "~3.4.0",
"symfony/monolog-bundle": "~3.7.0",
"sensio/framework-extra-bundle": "~6.2.6",
"knplabs/knp-menu": "~3.3.0",
"knplabs/knp-menu-bundle": "~3.2.0",
"friendsofsymfony/rest-bundle": "~3.5.0",
"friendsofsymfony/jsrouting-bundle": "3.2.*",
"friendsofsymfony/rest-bundle": "~3.8.0",
"friendsofsymfony/jsrouting-bundle": "~3.5.2",
"oro/api-doc-bundle": "2.1.*",
"zircote/swagger-php": "4.8.*",
"nelmio/security-bundle": "~3.0.0",
"zircote/swagger-php": "~4.11.1",
"nelmio/security-bundle": "~3.4.0",
"ass/xmlsecurity": "1.1.1",
"stof/doctrine-extensions-bundle": "~1.7.0",
"liip/imagine-bundle": "~2.10.0",
"laminas/laminas-mail": "~2.25.0",
"dragonmantank/cron-expression": "~3.3.2",
"oroinc/laminas-mail": "~2.27.0",
"dragonmantank/cron-expression": "~3.4.0",
"gos/web-socket-bundle": "~3.15.0",
"guzzlehttp/guzzle": "~7.5.0",
"guzzlehttp/psr7": "~2.4.0",
"guzzlehttp/guzzle": "~7.9.0",
"guzzlehttp/psr7": "~2.7.0",
"nesbot/carbon": "~2.65.0",
"monolog/monolog": "~2.8.0",
"monolog/monolog": "~2.10.0",
"ocramius/proxy-manager": "~2.11.1",
"knplabs/knp-gaufrette-bundle": "~0.8.0",
"oro/doctrine-extensions": "~2.0.2",
"ezyang/htmlpurifier": "~4.17.0",
"ezyang/htmlpurifier": "~4.18.0",
"xemlock/htmlpurifier-html5": "0.1.10",
"hwi/oauth-bundle": "2.1.0",
"kriswallsmith/buzz": "~1.2.0",
Expand All @@ -121,10 +121,10 @@
"box/spout": "~3.3.0",
"nette/php-generator": "~4.1.3",
"brick/math": "~0.11.0",
"phpdocumentor/reflection-docblock": "5.3.*",
"php-http/httplug-bundle": "~1.27.0",
"salsify/json-streaming-parser": "8.2.*",
"myclabs/deep-copy": "1.11.*",
"phpdocumentor/reflection-docblock": "~5.6.1",
"php-http/httplug-bundle": "~2.1.0",
"salsify/json-streaming-parser": "~8.3.1",
"myclabs/deep-copy": "1.12.*",
"symfony/requirements-checker": "^2.0.0",
"gedmo/doctrine-extensions": "~3.10.0",
"predis/predis": "~1.1.6",
Expand Down
46 changes: 23 additions & 23 deletions dev.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"php": "~8.3.0",
"php": "~8.4.0",
"ext-ctype": "*",
"ext-dom": "*",
"ext-gd": "*",
Expand Down Expand Up @@ -43,31 +43,31 @@
"symfony/finder": "~6.4.0",
"symfony/form": "~6.4.0",
"symfony/framework-bundle": "~6.4.0",
"symfony/http-client": "~6.4.0",
"symfony/http-foundation": "~6.4.0",
"symfony/http-client": "~6.4.15",
"symfony/http-foundation": "~6.4.14",
"symfony/http-kernel": "~6.4.0",
"symfony/string": "6.4.10",
"symfony/intl": "~6.4.0",
"symfony/lock": "~6.4.0",
"symfony/mime": "~6.4.0",
"symfony/monolog-bridge": "~6.4.0",
"symfony/options-resolver": "~6.4.0",
"symfony/process": "~6.4.0",
"symfony/process": "~6.4.14",
"symfony/property-access": "~6.4.0",
"symfony/property-info": "~6.4.0",
"symfony/proxy-manager-bridge": "~6.4.0",
"symfony/routing": "~6.4.0",
"symfony/runtime": "~6.4.0",
"symfony/runtime": "~6.4.14",
"symfony/security-core": "~6.4.0",
"symfony/security-csrf": "~6.4.0",
"symfony/security-http": "~6.4.0",
"symfony/security-http": "~6.4.15",
"symfony/security-bundle": "~6.4.0",
"symfony/serializer": "6.4.7",
"symfony/templating": "~6.4.0",
"symfony/translation": "~6.4.0",
"symfony/twig-bridge": "~6.4.0",
"symfony/twig-bundle": "~6.4.0",
"symfony/validator": "6.4.7",
"symfony/validator": "~6.4.11",
"symfony/web-link": "~6.4.0",
"symfony/yaml": "~6.4.0",
"symfony/mailer": "~6.4.0",
Expand All @@ -80,38 +80,38 @@
"symfony/polyfill-ctype": "1.24.0",
"symfony/security-acl": "~3.3.2",
"symfony/acl-bundle": "~2.3.0",
"twig/twig": "~3.5.0",
"twig/twig": "~3.11.3",
"doctrine/orm": "~2.15.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.8.0",
"doctrine/persistence": "~3.1.0",
"doctrine/persistence": "~3.4.0",
"symfony/monolog-bundle": "~3.7.0",
"sensio/framework-extra-bundle": "~6.2.6",
"knplabs/knp-menu": "~3.3.0",
"knplabs/knp-menu-bundle": "~3.2.0",
"friendsofsymfony/rest-bundle": "~3.5.0",
"friendsofsymfony/jsrouting-bundle": "3.2.*",
"friendsofsymfony/rest-bundle": "~3.8.0",
"friendsofsymfony/jsrouting-bundle": "~3.5.2",
"oro/api-doc-bundle": "2.1.*",
"zircote/swagger-php": "4.8.*",
"nelmio/security-bundle": "~3.0.0",
"zircote/swagger-php": "~4.11.1",
"nelmio/security-bundle": "~3.4.0",
"ass/xmlsecurity": "1.1.1",
"stof/doctrine-extensions-bundle": "~1.7.0",
"liip/imagine-bundle": "~2.10.0",
"laminas/laminas-mail": "^2.25.0",
"dragonmantank/cron-expression": "~3.3.2",
"oroinc/laminas-mail": "~2.27.0",
"dragonmantank/cron-expression": "~3.4.0",
"gos/web-socket-bundle": "~3.15.0",
"guzzlehttp/guzzle": "~7.5.0",
"guzzlehttp/psr7": "~2.4.0",
"guzzlehttp/guzzle": "~7.9.0",
"guzzlehttp/psr7": "~2.7.0",
"nesbot/carbon": "~2.65.0",
"monolog/monolog": "~2.8.0",
"monolog/monolog": "~2.10.0",
"ocramius/proxy-manager": "~2.11.1",
"knplabs/knp-gaufrette-bundle": "~0.8.0",
"oro/doctrine-extensions": "~2.0.2",
"ezyang/htmlpurifier": "~4.17.0",
"ezyang/htmlpurifier": "~4.18.0",
"xemlock/htmlpurifier-html5": "0.1.10",
"hwi/oauth-bundle": "2.1.0",
"kriswallsmith/buzz": "~1.2.0",
Expand All @@ -120,10 +120,10 @@
"box/spout": "~3.3.0",
"nette/php-generator": "~4.1.3",
"brick/math": "~0.11.0",
"phpdocumentor/reflection-docblock": "5.3.*",
"php-http/httplug-bundle": "~1.27.0",
"salsify/json-streaming-parser": "8.2.*",
"myclabs/deep-copy": "1.11.*",
"phpdocumentor/reflection-docblock": "~5.6.1",
"php-http/httplug-bundle": "~2.1.0",
"salsify/json-streaming-parser": "~8.3.1",
"myclabs/deep-copy": "1.12.*",
"symfony/requirements-checker": "^2.0.0",
"gedmo/doctrine-extensions": "~3.10.0",
"predis/predis": "~1.1.6",
Expand Down
Loading

0 comments on commit 52054f6

Please sign in to comment.