Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/dev/4.1' into 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
orocrmdeployer committed Jun 9, 2020
2 parents 3702e81 + db35ed5 commit b123cac
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 53 deletions.
95 changes: 48 additions & 47 deletions dev.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -977,20 +977,20 @@
},
{
"name": "doctrine/cache",
"version": "1.10.0",
"version": "1.10.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
"reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
"reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
"url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
"reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
"shasum": ""
},
"require": {
"php": "~7.1"
"php": "~7.1 || ^8.0"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
Expand Down Expand Up @@ -1055,7 +1055,7 @@
"redis",
"xcache"
],
"time": "2019-11-29T15:36:20+00:00"
"time": "2020-05-27T16:24:54+00:00"
},
{
"name": "doctrine/collections",
Expand Down Expand Up @@ -1655,20 +1655,20 @@
},
{
"name": "doctrine/inflector",
"version": "1.4.1",
"version": "1.4.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "4111f6853aea6f28b2b1dcfdde83d12dd3d5e6e3"
"reference": "4650c8b30c753a76bf44fb2ed00117d6f367490c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/4111f6853aea6f28b2b1dcfdde83d12dd3d5e6e3",
"reference": "4111f6853aea6f28b2b1dcfdde83d12dd3d5e6e3",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/4650c8b30c753a76bf44fb2ed00117d6f367490c",
"reference": "4650c8b30c753a76bf44fb2ed00117d6f367490c",
"shasum": ""
},
"require": {
"php": "^7.2"
"php": "^7.2 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^7.0",
Expand Down Expand Up @@ -1729,24 +1729,24 @@
"uppercase",
"words"
],
"time": "2020-05-09T15:09:09+00:00"
"time": "2020-05-29T07:19:59+00:00"
},
{
"name": "doctrine/instantiator",
"version": "1.3.0",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
"reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
"reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
"reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
"reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
"shasum": ""
},
"require": {
"php": "^7.1"
"php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
Expand Down Expand Up @@ -1785,24 +1785,24 @@
"constructor",
"instantiate"
],
"time": "2019-10-21T16:45:58+00:00"
"time": "2020-05-29T17:27:14+00:00"
},
{
"name": "doctrine/lexer",
"version": "1.2.0",
"version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
"reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
"reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
"shasum": ""
},
"require": {
"php": "^7.2"
"php": "^7.2 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
Expand Down Expand Up @@ -1847,7 +1847,7 @@
"parser",
"php"
],
"time": "2019-10-30T14:39:59+00:00"
"time": "2020-05-25T17:44:05+00:00"
},
{
"name": "doctrine/orm",
Expand Down Expand Up @@ -2906,24 +2906,24 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.5.3",
"version": "6.5.4",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e"
"reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e",
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1",
"php": ">=5.5",
"symfony/polyfill-intl-idn": "^1.11"
"symfony/polyfill-intl-idn": "1.17.0"
},
"require-dev": {
"ext-curl": "*",
Expand Down Expand Up @@ -2969,7 +2969,7 @@
"rest",
"web service"
],
"time": "2020-04-18T10:38:46+00:00"
"time": "2020-05-25T19:35:05+00:00"
},
{
"name": "guzzlehttp/promises",
Expand Down Expand Up @@ -4516,16 +4516,16 @@
},
{
"name": "justinrainbow/json-schema",
"version": "5.2.9",
"version": "5.2.10",
"source": {
"type": "git",
"url": "https://github.com/justinrainbow/json-schema.git",
"reference": "44c6787311242a979fa15c704327c20e7221a0e4"
"reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
"reference": "44c6787311242a979fa15c704327c20e7221a0e4",
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b",
"reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -4578,7 +4578,7 @@
"json",
"schema"
],
"time": "2019-09-25T14:49:45+00:00"
"time": "2020-05-27T16:41:55+00:00"
},
{
"name": "knplabs/gaufrette",
Expand Down Expand Up @@ -6893,7 +6893,7 @@
"dist": {
"type": "path",
"url": "../../package/platform",
"reference": "d8f723a76ba53f7b8f9a216d986a6d468b732be8"
"reference": "0523f46117dbbbc7823d6bb749542cf4deedbd72"
},
"require": {
"akeneo/batch-bundle": "0.4.11",
Expand Down Expand Up @@ -6927,6 +6927,7 @@
"hwi/oauth-bundle": "0.6.*",
"incenteev/composer-parameter-handler": "2.1.*",
"jms/cg": "1.2.*",
"jms/metadata": "2.1.0",
"jms/serializer": "3.4.*",
"jms/serializer-bundle": "3.5.*",
"knplabs/knp-gaufrette-bundle": "0.5.2",
Expand Down Expand Up @@ -9325,16 +9326,16 @@
},
{
"name": "snc/redis-bundle",
"version": "3.2.2",
"version": "3.2.3",
"source": {
"type": "git",
"url": "https://github.com/snc/SncRedisBundle.git",
"reference": "7d9294b2f90d39a0e2120c6f35a017895482416b"
"reference": "cd47f699eeb6cffa72eaa505d3dcf907b157339b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/snc/SncRedisBundle/zipball/7d9294b2f90d39a0e2120c6f35a017895482416b",
"reference": "7d9294b2f90d39a0e2120c6f35a017895482416b",
"url": "https://api.github.com/repos/snc/SncRedisBundle/zipball/cd47f699eeb6cffa72eaa505d3dcf907b157339b",
"reference": "cd47f699eeb6cffa72eaa505d3dcf907b157339b",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -9400,7 +9401,7 @@
"redis",
"symfony"
],
"time": "2020-04-30T05:56:02+00:00"
"time": "2020-06-05T06:53:24+00:00"
},
{
"name": "stof/doctrine-extensions-bundle",
Expand Down Expand Up @@ -11866,16 +11867,16 @@
},
{
"name": "composer/xdebug-handler",
"version": "1.4.1",
"version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
"reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
"reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
"reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
"reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -11906,7 +11907,7 @@
"Xdebug",
"performance"
],
"time": "2020-03-01T12:26:26+00:00"
"time": "2020-06-04T11:16:35+00:00"
},
{
"name": "friendsofphp/php-cs-fixer",
Expand Down Expand Up @@ -13853,7 +13854,7 @@
},
{
"name": "symfony/class-loader",
"version": "v3.4.40",
"version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/class-loader.git",
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b123cac

Please sign in to comment.