aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2019-09-24 08:43:48 +0200
committerGitHub <noreply@github.com>2019-09-24 08:43:48 +0200
commited59ec63aa81b74acd0f99793e552ab8cb144414 (patch)
treefa28c0b8677f2d1b6de737ab76d84a14a2830197
parent492aacd194463dec813a5ef94be156ca41adaac8 (diff)
parent2133ca311626b3fce2196d83fdef8add554ea909 (diff)
downloadwallabag-ed59ec63aa81b74acd0f99793e552ab8cb144414.tar.gz
wallabag-ed59ec63aa81b74acd0f99793e552ab8cb144414.tar.zst
wallabag-ed59ec63aa81b74acd0f99793e552ab8cb144414.zip
Merge pull request #4124 from wallabag/dependabot/composer/doctrine/orm-2.6.4
Bump doctrine/orm from 2.6.3 to 2.6.4
-rw-r--r--composer.lock71
1 files changed, 36 insertions, 35 deletions
diff --git a/composer.lock b/composer.lock
index e1c55a54..03106d9e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -555,16 +555,16 @@
555 }, 555 },
556 { 556 {
557 "name": "doctrine/common", 557 "name": "doctrine/common",
558 "version": "v2.10.0", 558 "version": "v2.11.0",
559 "source": { 559 "source": {
560 "type": "git", 560 "type": "git",
561 "url": "https://github.com/doctrine/common.git", 561 "url": "https://github.com/doctrine/common.git",
562 "reference": "30e33f60f64deec87df728c02b107f82cdafad9d" 562 "reference": "b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff"
563 }, 563 },
564 "dist": { 564 "dist": {
565 "type": "zip", 565 "type": "zip",
566 "url": "https://api.github.com/repos/doctrine/common/zipball/30e33f60f64deec87df728c02b107f82cdafad9d", 566 "url": "https://api.github.com/repos/doctrine/common/zipball/b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff",
567 "reference": "30e33f60f64deec87df728c02b107f82cdafad9d", 567 "reference": "b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff",
568 "shasum": "" 568 "shasum": ""
569 }, 569 },
570 "require": { 570 "require": {
@@ -580,14 +580,16 @@
580 }, 580 },
581 "require-dev": { 581 "require-dev": {
582 "doctrine/coding-standard": "^1.0", 582 "doctrine/coding-standard": "^1.0",
583 "phpunit/phpunit": "^6.3", 583 "phpstan/phpstan": "^0.11",
584 "phpstan/phpstan-phpunit": "^0.11",
585 "phpunit/phpunit": "^7.0",
584 "squizlabs/php_codesniffer": "^3.0", 586 "squizlabs/php_codesniffer": "^3.0",
585 "symfony/phpunit-bridge": "^4.0.5" 587 "symfony/phpunit-bridge": "^4.0.5"
586 }, 588 },
587 "type": "library", 589 "type": "library",
588 "extra": { 590 "extra": {
589 "branch-alias": { 591 "branch-alias": {
590 "dev-master": "2.10.x-dev" 592 "dev-master": "2.11.x-dev"
591 } 593 }
592 }, 594 },
593 "autoload": { 595 "autoload": {
@@ -601,6 +603,10 @@
601 ], 603 ],
602 "authors": [ 604 "authors": [
603 { 605 {
606 "name": "Guilherme Blanco",
607 "email": "guilhermeblanco@gmail.com"
608 },
609 {
604 "name": "Roman Borschel", 610 "name": "Roman Borschel",
605 "email": "roman@code-factory.org" 611 "email": "roman@code-factory.org"
606 }, 612 },
@@ -609,10 +615,6 @@
609 "email": "kontakt@beberlei.de" 615 "email": "kontakt@beberlei.de"
610 }, 616 },
611 { 617 {
612 "name": "Guilherme Blanco",
613 "email": "guilhermeblanco@gmail.com"
614 },
615 {
616 "name": "Jonathan Wage", 618 "name": "Jonathan Wage",
617 "email": "jonwage@gmail.com" 619 "email": "jonwage@gmail.com"
618 }, 620 },
@@ -632,7 +634,7 @@
632 "doctrine", 634 "doctrine",
633 "php" 635 "php"
634 ], 636 ],
635 "time": "2018-11-21T01:24:55+00:00" 637 "time": "2019-09-10T10:10:14+00:00"
636 }, 638 },
637 { 639 {
638 "name": "doctrine/dbal", 640 "name": "doctrine/dbal",
@@ -1290,16 +1292,16 @@
1290 }, 1292 },
1291 { 1293 {
1292 "name": "doctrine/orm", 1294 "name": "doctrine/orm",
1293 "version": "v2.6.3", 1295 "version": "v2.6.4",
1294 "source": { 1296 "source": {
1295 "type": "git", 1297 "type": "git",
1296 "url": "https://github.com/doctrine/orm.git", 1298 "url": "https://github.com/doctrine/orm.git",
1297 "reference": "434820973cadf2da2d66e7184be370084cc32ca8" 1299 "reference": "b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43"
1298 }, 1300 },
1299 "dist": { 1301 "dist": {
1300 "type": "zip", 1302 "type": "zip",
1301 "url": "https://api.github.com/repos/doctrine/orm/zipball/434820973cadf2da2d66e7184be370084cc32ca8", 1303 "url": "https://api.github.com/repos/doctrine/orm/zipball/b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43",
1302 "reference": "434820973cadf2da2d66e7184be370084cc32ca8", 1304 "reference": "b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43",
1303 "shasum": "" 1305 "shasum": ""
1304 }, 1306 },
1305 "require": { 1307 "require": {
@@ -1314,9 +1316,8 @@
1314 "symfony/console": "~3.0|~4.0" 1316 "symfony/console": "~3.0|~4.0"
1315 }, 1317 },
1316 "require-dev": { 1318 "require-dev": {
1317 "doctrine/coding-standard": "^1.0", 1319 "doctrine/coding-standard": "^5.0",
1318 "phpunit/phpunit": "^6.5", 1320 "phpunit/phpunit": "^7.5",
1319 "squizlabs/php_codesniffer": "^3.2",
1320 "symfony/yaml": "~3.4|~4.0" 1321 "symfony/yaml": "~3.4|~4.0"
1321 }, 1322 },
1322 "suggest": { 1323 "suggest": {
@@ -1342,6 +1343,10 @@
1342 ], 1343 ],
1343 "authors": [ 1344 "authors": [
1344 { 1345 {
1346 "name": "Guilherme Blanco",
1347 "email": "guilhermeblanco@gmail.com"
1348 },
1349 {
1345 "name": "Roman Borschel", 1350 "name": "Roman Borschel",
1346 "email": "roman@code-factory.org" 1351 "email": "roman@code-factory.org"
1347 }, 1352 },
@@ -1350,10 +1355,6 @@
1350 "email": "kontakt@beberlei.de" 1355 "email": "kontakt@beberlei.de"
1351 }, 1356 },
1352 { 1357 {
1353 "name": "Guilherme Blanco",
1354 "email": "guilhermeblanco@gmail.com"
1355 },
1356 {
1357 "name": "Jonathan Wage", 1358 "name": "Jonathan Wage",
1358 "email": "jonwage@gmail.com" 1359 "email": "jonwage@gmail.com"
1359 }, 1360 },
@@ -1368,7 +1369,7 @@
1368 "database", 1369 "database",
1369 "orm" 1370 "orm"
1370 ], 1371 ],
1371 "time": "2018-11-20T23:46:46+00:00" 1372 "time": "2019-09-20T14:30:26+00:00"
1372 }, 1373 },
1373 { 1374 {
1374 "name": "doctrine/persistence", 1375 "name": "doctrine/persistence",
@@ -1616,13 +1617,13 @@
1616 "authors": [ 1617 "authors": [
1617 { 1618 {
1618 "name": "Multiple users", 1619 "name": "Multiple users",
1619 "role": "Original developers", 1620 "homepage": "https://code.google.com/p/html5lib/",
1620 "homepage": "https://code.google.com/p/html5lib/" 1621 "role": "Original developers"
1621 }, 1622 },
1622 { 1623 {
1623 "name": "Sébastien Lavoie", 1624 "name": "Sébastien Lavoie",
1624 "role": "Packager", 1625 "homepage": "http://blog.lavoie.sl",
1625 "homepage": "http://blog.lavoie.sl" 1626 "role": "Packager"
1626 }, 1627 },
1627 { 1628 {
1628 "name": "didier Belot", 1629 "name": "didier Belot",
@@ -6446,9 +6447,9 @@
6446 "authors": [ 6447 "authors": [
6447 { 6448 {
6448 "name": "Antonio Carlos Ribeiro", 6449 "name": "Antonio Carlos Ribeiro",
6449 "role": "Developer",
6450 "email": "acr@antoniocarlosribeiro.com", 6450 "email": "acr@antoniocarlosribeiro.com",
6451 "homepage": "https://antoniocarlosribeiro.com" 6451 "homepage": "https://antoniocarlosribeiro.com",
6452 "role": "Developer"
6452 } 6453 }
6453 ], 6454 ],
6454 "description": "Create random chars, numbers, strings", 6455 "description": "Create random chars, numbers, strings",
@@ -6508,9 +6509,9 @@
6508 "authors": [ 6509 "authors": [
6509 { 6510 {
6510 "name": "Antonio Carlos Ribeiro", 6511 "name": "Antonio Carlos Ribeiro",
6511 "role": "Developer",
6512 "email": "acr@antoniocarlosribeiro.com", 6512 "email": "acr@antoniocarlosribeiro.com",
6513 "homepage": "https://antoniocarlosribeiro.com" 6513 "homepage": "https://antoniocarlosribeiro.com",
6514 "role": "Developer"
6514 } 6515 }
6515 ], 6516 ],
6516 "description": "Create recovery codes for two factor auth", 6517 "description": "Create recovery codes for two factor auth",
@@ -9216,14 +9217,14 @@
9216 "authors": [ 9217 "authors": [
9217 { 9218 {
9218 "name": "Nicola Asuni", 9219 "name": "Nicola Asuni",
9219 "role": "Main developer",
9220 "email": "info@tecnick.com", 9220 "email": "info@tecnick.com",
9221 "homepage": "http://nicolaasuni.tecnick.com" 9221 "homepage": "http://nicolaasuni.tecnick.com",
9222 "role": "Main developer"
9222 }, 9223 },
9223 { 9224 {
9224 "name": "wallabag/core", 9225 "name": "wallabag/core",
9225 "role": "Developers", 9226 "homepage": "https://www.wallabag.org",
9226 "homepage": "https://www.wallabag.org" 9227 "role": "Developers"
9227 } 9228 }
9228 ], 9229 ],
9229 "description": "Keeping a working 6.2.x TCPDF version.", 9230 "description": "Keeping a working 6.2.x TCPDF version.",