Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/dev/5.0' into 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
CI bot committed Mar 16, 2023
2 parents 845b584 + f0444b4 commit 6b6c002
Show file tree
Hide file tree
Showing 4 changed files with 500 additions and 506 deletions.
3 changes: 3 additions & 0 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
"bin-dir": "bin",
"fxp-asset": {
"enabled": false
},
"allow-plugins": {
"php-http/discovery": false
}
},
"scripts": {
Expand Down
3 changes: 3 additions & 0 deletions dev.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@
"bin-dir": "bin",
"fxp-asset": {
"enabled": false
},
"allow-plugins": {
"php-http/discovery": false
}
},
"scripts": {
Expand Down
116 changes: 62 additions & 54 deletions dev.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,16 +461,16 @@
},
{
"name": "composer/composer",
"version": "2.2.19",
"version": "2.2.21",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
"reference": "30ff21a9af9a10845436abaeeb0bb7276e996d24"
"reference": "978198befc71de0b18fc1fc5a472c03b184b504a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/30ff21a9af9a10845436abaeeb0bb7276e996d24",
"reference": "30ff21a9af9a10845436abaeeb0bb7276e996d24",
"url": "https://api.github.com/repos/composer/composer/zipball/978198befc71de0b18fc1fc5a472c03b184b504a",
"reference": "978198befc71de0b18fc1fc5a472c03b184b504a",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -540,7 +540,7 @@
"support": {
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues",
"source": "https://github.com/composer/composer/tree/2.2.19"
"source": "https://github.com/composer/composer/tree/2.2.21"
},
"funding": [
{
Expand All @@ -556,7 +556,7 @@
"type": "tidelift"
}
],
"time": "2023-02-04T13:54:48+00:00"
"time": "2023-02-15T12:07:40+00:00"
},
{
"name": "composer/metadata-minifier",
Expand Down Expand Up @@ -5716,7 +5716,7 @@
"dist": {
"type": "path",
"url": "../../package/crm",
"reference": "7b21372f056ca257b46221deaef9129be25739db"
"reference": "b6cded0d9543cd5944ec2779badf4e3c81412a81"
},
"require": {
"oro/calendar-bundle": "5.0.*",
Expand Down Expand Up @@ -6232,7 +6232,7 @@
"dist": {
"type": "path",
"url": "../../package/platform",
"reference": "f8b08bb7bea7940670262f95af85a377f96cb517"
"reference": "d0b4f0cc1a22b71f3a3026782db4abdc6ffe18e8"
},
"require": {
"ass/xmlsecurity": "1.1.1",
Expand Down Expand Up @@ -6316,7 +6316,7 @@
"symfony/http-client": "5.4.3",
"symfony/http-client-contracts": "^2.1",
"symfony/http-foundation": "5.4.3",
"symfony/http-kernel": "5.4.4",
"symfony/http-kernel": "5.4.20",
"symfony/intl": "5.4.3",
"symfony/lock": "5.4.3",
"symfony/mailer": "5.4.3",
Expand All @@ -6333,11 +6333,11 @@
"symfony/requirements-checker": "^2.0.0",
"symfony/routing": "~5.4.0",
"symfony/security-acl": "~3.2.0",
"symfony/security-bundle": "5.4.3",
"symfony/security-core": "5.4.3",
"symfony/security-bundle": "5.4.20",
"symfony/security-core": "5.4.19",
"symfony/security-csrf": "~5.4.0",
"symfony/security-guard": "~5.4.0",
"symfony/security-http": "5.4.3",
"symfony/security-http": "5.4.20",
"symfony/serializer": "5.4.3",
"symfony/service-contracts": "^2.1",
"symfony/string": "~5.4.0",
Expand Down Expand Up @@ -6771,38 +6771,44 @@
},
{
"name": "php-http/discovery",
"version": "1.14.3",
"version": "1.15.2",
"source": {
"type": "git",
"url": "https://github.com/php-http/discovery.git",
"reference": "31d8ee46d0215108df16a8527c7438e96a4d7735"
"reference": "5cc428320191ac1d0b6520034c2dc0698628ced5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/discovery/zipball/31d8ee46d0215108df16a8527c7438e96a4d7735",
"reference": "31d8ee46d0215108df16a8527c7438e96a4d7735",
"url": "https://api.github.com/repos/php-http/discovery/zipball/5cc428320191ac1d0b6520034c2dc0698628ced5",
"reference": "5cc428320191ac1d0b6520034c2dc0698628ced5",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0|^2.0",
"php": "^7.1 || ^8.0"
},
"conflict": {
"nyholm/psr7": "<1.0"
},
"provide": {
"php-http/async-client-implementation": "*",
"php-http/client-implementation": "*",
"psr/http-client-implementation": "*",
"psr/http-factory-implementation": "*",
"psr/http-message-implementation": "*"
},
"require-dev": {
"composer/composer": "^1.0.2|^2.0",
"graham-campbell/phpspec-skip-example-extension": "^5.0",
"php-http/httplug": "^1.0 || ^2.0",
"php-http/message-factory": "^1.0",
"phpspec/phpspec": "^5.1 || ^6.1"
},
"suggest": {
"php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories"
"phpspec/phpspec": "^5.1 || ^6.1 || ^7.3",
"symfony/phpunit-bridge": "^6.2"
},
"type": "library",
"type": "composer-plugin",
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
}
"class": "Http\\Discovery\\Composer\\Plugin",
"plugin-optional": true
},
"autoload": {
"psr-4": {
Expand All @@ -6819,7 +6825,7 @@
"email": "[email protected]"
}
],
"description": "Finds installed HTTPlug implementations and PSR-7 message factories",
"description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations",
"homepage": "http://php-http.org",
"keywords": [
"adapter",
Expand All @@ -6828,13 +6834,14 @@
"factory",
"http",
"message",
"psr17",
"psr7"
],
"support": {
"issues": "https://github.com/php-http/discovery/issues",
"source": "https://github.com/php-http/discovery/tree/1.14.3"
"source": "https://github.com/php-http/discovery/tree/1.15.2"
},
"time": "2022-07-11T14:04:40+00:00"
"time": "2023-02-11T08:28:41+00:00"
},
{
"name": "php-http/httplug",
Expand Down Expand Up @@ -10881,16 +10888,16 @@
},
{
"name": "symfony/http-kernel",
"version": "v5.4.4",
"version": "v5.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "49f40347228c773688a0488feea0175aa7f4d268"
"reference": "aaeec341582d3c160cc9ecfa8b2419ba6c69954e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/49f40347228c773688a0488feea0175aa7f4d268",
"reference": "49f40347228c773688a0488feea0175aa7f4d268",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/aaeec341582d3c160cc9ecfa8b2419ba6c69954e",
"reference": "aaeec341582d3c160cc9ecfa8b2419ba6c69954e",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -10973,7 +10980,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v5.4.4"
"source": "https://github.com/symfony/http-kernel/tree/v5.4.20"
},
"funding": [
{
Expand All @@ -10989,7 +10996,7 @@
"type": "tidelift"
}
],
"time": "2022-01-29T18:08:07+00:00"
"time": "2023-02-01T08:18:48+00:00"
},
{
"name": "symfony/intl",
Expand Down Expand Up @@ -13054,16 +13061,16 @@
},
{
"name": "symfony/security-bundle",
"version": "v5.4.3",
"version": "v5.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/security-bundle.git",
"reference": "d3239128269ae67d78df535f65f41cf02cabdc6c"
"reference": "1a049b77e70e890c5d5d2105d96ce8b35890197e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/security-bundle/zipball/d3239128269ae67d78df535f65f41cf02cabdc6c",
"reference": "d3239128269ae67d78df535f65f41cf02cabdc6c",
"url": "https://api.github.com/repos/symfony/security-bundle/zipball/1a049b77e70e890c5d5d2105d96ce8b35890197e",
"reference": "1a049b77e70e890c5d5d2105d96ce8b35890197e",
"shasum": ""
},
"require": {
Expand All @@ -13080,7 +13087,7 @@
"symfony/security-core": "^5.4|^6.0",
"symfony/security-csrf": "^4.4|^5.0|^6.0",
"symfony/security-guard": "^5.3",
"symfony/security-http": "^5.4|^6.0"
"symfony/security-http": "^5.4.20|~6.0.20|~6.1.12|^6.2.6"
},
"conflict": {
"symfony/browser-kit": "<4.4",
Expand All @@ -13090,7 +13097,7 @@
"symfony/twig-bundle": "<4.4"
},
"require-dev": {
"doctrine/annotations": "^1.10.4",
"doctrine/annotations": "^1.10.4|^2",
"symfony/asset": "^4.4|^5.0|^6.0",
"symfony/browser-kit": "^4.4|^5.0|^6.0",
"symfony/console": "^4.4|^5.0|^6.0",
Expand Down Expand Up @@ -13136,7 +13143,7 @@
"description": "Provides a tight integration of the Security component into the Symfony full-stack framework",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/security-bundle/tree/v5.4.3"
"source": "https://github.com/symfony/security-bundle/tree/v5.4.20"
},
"funding": [
{
Expand All @@ -13152,20 +13159,20 @@
"type": "tidelift"
}
],
"time": "2022-01-02T09:53:40+00:00"
"time": "2023-01-30T09:35:58+00:00"
},
{
"name": "symfony/security-core",
"version": "v5.4.3",
"version": "v5.4.19",
"source": {
"type": "git",
"url": "https://github.com/symfony/security-core.git",
"reference": "b26a44457a4d1a60c79f1c23273e812c4077ce85"
"reference": "76fe5a7c62a3f23a5d7b72a55529e94ae2c1ae07"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/security-core/zipball/b26a44457a4d1a60c79f1c23273e812c4077ce85",
"reference": "b26a44457a4d1a60c79f1c23273e812c4077ce85",
"url": "https://api.github.com/repos/symfony/security-core/zipball/76fe5a7c62a3f23a5d7b72a55529e94ae2c1ae07",
"reference": "76fe5a7c62a3f23a5d7b72a55529e94ae2c1ae07",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -13229,7 +13236,7 @@
"description": "Symfony Security Component - Core Library",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/security-core/tree/v5.4.3"
"source": "https://github.com/symfony/security-core/tree/v5.4.19"
},
"funding": [
{
Expand All @@ -13245,7 +13252,7 @@
"type": "tidelift"
}
],
"time": "2022-01-02T09:53:40+00:00"
"time": "2023-01-24T10:56:59+00:00"
},
{
"name": "symfony/security-csrf",
Expand Down Expand Up @@ -13388,16 +13395,16 @@
},
{
"name": "symfony/security-http",
"version": "v5.4.3",
"version": "v5.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/security-http.git",
"reference": "536aadbdb6c6a3f13000aa445919a1f052ae2630"
"reference": "0236efe37462df3204e758e3a55661a43285d948"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/security-http/zipball/536aadbdb6c6a3f13000aa445919a1f052ae2630",
"reference": "536aadbdb6c6a3f13000aa445919a1f052ae2630",
"url": "https://api.github.com/repos/symfony/security-http/zipball/0236efe37462df3204e758e3a55661a43285d948",
"reference": "0236efe37462df3204e758e3a55661a43285d948",
"shasum": ""
},
"require": {
Expand All @@ -13408,7 +13415,7 @@
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php80": "^1.16",
"symfony/property-access": "^4.4|^5.0|^6.0",
"symfony/security-core": "^5.4|^6.0"
"symfony/security-core": "^5.4.19|~6.0.19|~6.1.11|^6.2.5"
},
"conflict": {
"symfony/event-dispatcher": "<4.3",
Expand Down Expand Up @@ -13453,7 +13460,7 @@
"description": "Symfony Security Component - HTTP Integration",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/security-http/tree/v5.4.3"
"source": "https://github.com/symfony/security-http/tree/v5.4.20"
},
"funding": [
{
Expand All @@ -13469,7 +13476,7 @@
"type": "tidelift"
}
],
"time": "2022-01-02T09:53:40+00:00"
"time": "2023-01-30T09:35:58+00:00"
},
{
"name": "symfony/serializer",
Expand Down Expand Up @@ -17632,6 +17639,7 @@
"type": "github"
}
],
"abandoned": true,
"time": "2020-12-07T05:39:23+00:00"
},
{
Expand Down
Loading

0 comments on commit 6b6c002

Please sign in to comment.