Skip to content

Commit cc3a8c6

Browse files
author
orocrmdeployer
committed
Merge remote-tracking branch 'remotes/dev/4.1' into 4.1
2 parents 6ad6808 + 0cd73e5 commit cc3a8c6

File tree

1 file changed

+44
-25
lines changed

1 file changed

+44
-25
lines changed

dev.lock

+44-25
Original file line numberDiff line numberDiff line change
@@ -1271,29 +1271,32 @@
12711271
},
12721272
{
12731273
"name": "doctrine/dbal",
1274-
"version": "v2.7.2",
1274+
"version": "2.10.2",
12751275
"source": {
12761276
"type": "git",
12771277
"url": "https://github.com/doctrine/dbal.git",
1278-
"reference": "c0e5736016a51b427a8cba8bc470fbea78165819"
1278+
"reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8"
12791279
},
12801280
"dist": {
12811281
"type": "zip",
1282-
"url": "https://api.github.com/repos/doctrine/dbal/zipball/c0e5736016a51b427a8cba8bc470fbea78165819",
1283-
"reference": "c0e5736016a51b427a8cba8bc470fbea78165819",
1282+
"url": "https://api.github.com/repos/doctrine/dbal/zipball/aab745e7b6b2de3b47019da81e7225e14dcfdac8",
1283+
"reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8",
12841284
"shasum": ""
12851285
},
12861286
"require": {
1287-
"doctrine/common": "^2.7.1",
1287+
"doctrine/cache": "^1.0",
1288+
"doctrine/event-manager": "^1.0",
12881289
"ext-pdo": "*",
1289-
"php": "^7.1"
1290+
"php": "^7.2"
12901291
},
12911292
"require-dev": {
1292-
"doctrine/coding-standard": "^4.0",
1293-
"phpunit/phpunit": "^7.0",
1294-
"phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
1295-
"symfony/console": "^2.0.5||^3.0",
1296-
"symfony/phpunit-bridge": "^3.4.5|^4.0.5"
1293+
"doctrine/coding-standard": "^6.0",
1294+
"jetbrains/phpstorm-stubs": "^2019.1",
1295+
"nikic/php-parser": "^4.4",
1296+
"phpstan/phpstan": "^0.12",
1297+
"phpunit/phpunit": "^8.4.1",
1298+
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
1299+
"vimeo/psalm": "^3.11"
12971300
},
12981301
"suggest": {
12991302
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -1304,19 +1307,24 @@
13041307
"type": "library",
13051308
"extra": {
13061309
"branch-alias": {
1307-
"dev-master": "2.7.x-dev"
1310+
"dev-master": "2.10.x-dev",
1311+
"dev-develop": "3.0.x-dev"
13081312
}
13091313
},
13101314
"autoload": {
1311-
"psr-0": {
1312-
"Doctrine\\DBAL\\": "lib/"
1315+
"psr-4": {
1316+
"Doctrine\\DBAL\\": "lib/Doctrine/DBAL"
13131317
}
13141318
},
13151319
"notification-url": "https://packagist.org/downloads/",
13161320
"license": [
13171321
"MIT"
13181322
],
13191323
"authors": [
1324+
{
1325+
"name": "Guilherme Blanco",
1326+
"email": "[email protected]"
1327+
},
13201328
{
13211329
"name": "Roman Borschel",
13221330
"email": "[email protected]"
@@ -1325,24 +1333,35 @@
13251333
"name": "Benjamin Eberlei",
13261334
"email": "[email protected]"
13271335
},
1328-
{
1329-
"name": "Guilherme Blanco",
1330-
"email": "[email protected]"
1331-
},
13321336
{
13331337
"name": "Jonathan Wage",
13341338
"email": "[email protected]"
13351339
}
13361340
],
1337-
"description": "Database Abstraction Layer",
1338-
"homepage": "http://www.doctrine-project.org",
1341+
"description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.",
1342+
"homepage": "https://www.doctrine-project.org/projects/dbal.html",
13391343
"keywords": [
1344+
"abstraction",
13401345
"database",
1346+
"db2",
13411347
"dbal",
1342-
"persistence",
1343-
"queryobject"
1348+
"mariadb",
1349+
"mssql",
1350+
"mysql",
1351+
"oci8",
1352+
"oracle",
1353+
"pdo",
1354+
"pgsql",
1355+
"postgresql",
1356+
"queryobject",
1357+
"sasql",
1358+
"sql",
1359+
"sqlanywhere",
1360+
"sqlite",
1361+
"sqlserver",
1362+
"sqlsrv"
13441363
],
1345-
"time": "2018-07-13T04:49:01+00:00"
1364+
"time": "2020-04-20T17:19:26+00:00"
13461365
},
13471366
{
13481367
"name": "doctrine/doctrine-bundle",
@@ -6975,7 +6994,7 @@
69756994
"dist": {
69766995
"type": "path",
69776996
"url": "../../package/platform",
6978-
"reference": "0523f46117dbbbc7823d6bb749542cf4deedbd72"
6997+
"reference": "305aeab7ce2b0682cc5ca9b4593008c78e1140a1"
69796998
},
69806999
"require": {
69817000
"akeneo/batch-bundle": "0.4.11",
@@ -6986,7 +7005,7 @@
69867005
"doctrine/annotations": "1.7.*",
69877006
"doctrine/collections": "1.5.*",
69887007
"doctrine/data-fixtures": "1.3.*",
6989-
"doctrine/dbal": "2.7.*",
7008+
"doctrine/dbal": "2.10.*",
69907009
"doctrine/doctrine-bundle": "1.9.*",
69917010
"doctrine/doctrine-fixtures-bundle": "2.4.*",
69927011
"doctrine/orm": "2.6.4",

0 commit comments

Comments
 (0)