diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-12-19 08:01:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-19 08:01:47 +0100 |
commit | 2e267a88a5e830f2dd83b0bd695ffb1d97e122da (patch) | |
tree | 20ae62daec443014f9f050950cc5b6a1e66dcd54 | |
parent | 878a886365af8a35b4b185bc6a55fdd0657d28aa (diff) | |
parent | 34154ecf1d887e2c53ea4696f44ba668b792ec6b (diff) | |
download | wallabag-2e267a88a5e830f2dd83b0bd695ffb1d97e122da.tar.gz wallabag-2e267a88a5e830f2dd83b0bd695ffb1d97e122da.tar.zst wallabag-2e267a88a5e830f2dd83b0bd695ffb1d97e122da.zip |
Merge pull request #4229 from wallabag/dependabot/composer/doctrine/doctrine-bundle-1.12.5
Bump doctrine/doctrine-bundle from 1.12.2 to 1.12.5
-rw-r--r-- | composer.lock | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/composer.lock b/composer.lock index 8fc28ddf..6ae1e522 100644 --- a/composer.lock +++ b/composer.lock | |||
@@ -735,21 +735,22 @@ | |||
735 | }, | 735 | }, |
736 | { | 736 | { |
737 | "name": "doctrine/doctrine-bundle", | 737 | "name": "doctrine/doctrine-bundle", |
738 | "version": "1.12.2", | 738 | "version": "1.12.5", |
739 | "source": { | 739 | "source": { |
740 | "type": "git", | 740 | "type": "git", |
741 | "url": "https://github.com/doctrine/DoctrineBundle.git", | 741 | "url": "https://github.com/doctrine/DoctrineBundle.git", |
742 | "reference": "9ac04186b47abda4759d0c304ab8f0780c470ac9" | 742 | "reference": "5d477e6fecac2718b8c43e658abe2a19b225ba25" |
743 | }, | 743 | }, |
744 | "dist": { | 744 | "dist": { |
745 | "type": "zip", | 745 | "type": "zip", |
746 | "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/9ac04186b47abda4759d0c304ab8f0780c470ac9", | 746 | "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/5d477e6fecac2718b8c43e658abe2a19b225ba25", |
747 | "reference": "9ac04186b47abda4759d0c304ab8f0780c470ac9", | 747 | "reference": "5d477e6fecac2718b8c43e658abe2a19b225ba25", |
748 | "shasum": "" | 748 | "shasum": "" |
749 | }, | 749 | }, |
750 | "require": { | 750 | "require": { |
751 | "doctrine/dbal": "^2.5.12", | 751 | "doctrine/dbal": "^2.5.12", |
752 | "doctrine/doctrine-cache-bundle": "~1.2", | 752 | "doctrine/doctrine-cache-bundle": "~1.2", |
753 | "doctrine/persistence": "^1.3.3", | ||
753 | "jdorn/sql-formatter": "^1.2.16", | 754 | "jdorn/sql-formatter": "^1.2.16", |
754 | "php": "^7.1", | 755 | "php": "^7.1", |
755 | "symfony/cache": "^3.4.30|^4.3.3", | 756 | "symfony/cache": "^3.4.30|^4.3.3", |
@@ -757,7 +758,8 @@ | |||
757 | "symfony/console": "^3.4.30|^4.3.3", | 758 | "symfony/console": "^3.4.30|^4.3.3", |
758 | "symfony/dependency-injection": "^3.4.30|^4.3.3", | 759 | "symfony/dependency-injection": "^3.4.30|^4.3.3", |
759 | "symfony/doctrine-bridge": "^3.4.30|^4.3.3", | 760 | "symfony/doctrine-bridge": "^3.4.30|^4.3.3", |
760 | "symfony/framework-bundle": "^3.4.30|^4.3.3" | 761 | "symfony/framework-bundle": "^3.4.30|^4.3.3", |
762 | "symfony/service-contracts": "^1.1.1|^2.0" | ||
761 | }, | 763 | }, |
762 | "conflict": { | 764 | "conflict": { |
763 | "doctrine/orm": "<2.6", | 765 | "doctrine/orm": "<2.6", |
@@ -766,6 +768,7 @@ | |||
766 | "require-dev": { | 768 | "require-dev": { |
767 | "doctrine/coding-standard": "^6.0", | 769 | "doctrine/coding-standard": "^6.0", |
768 | "doctrine/orm": "^2.6", | 770 | "doctrine/orm": "^2.6", |
771 | "ocramius/proxy-manager": "^2.1", | ||
769 | "php-coveralls/php-coveralls": "^2.1", | 772 | "php-coveralls/php-coveralls": "^2.1", |
770 | "phpunit/phpunit": "^7.5", | 773 | "phpunit/phpunit": "^7.5", |
771 | "symfony/phpunit-bridge": "^4.2", | 774 | "symfony/phpunit-bridge": "^4.2", |
@@ -821,7 +824,7 @@ | |||
821 | "orm", | 824 | "orm", |
822 | "persistence" | 825 | "persistence" |
823 | ], | 826 | ], |
824 | "time": "2019-11-28T13:00:49+00:00" | 827 | "time": "2019-12-18T18:15:25+00:00" |
825 | }, | 828 | }, |
826 | { | 829 | { |
827 | "name": "doctrine/doctrine-cache-bundle", | 830 | "name": "doctrine/doctrine-cache-bundle", |
@@ -7849,7 +7852,7 @@ | |||
7849 | ], | 7852 | ], |
7850 | "authors": [ | 7853 | "authors": [ |
7851 | { | 7854 | { |
7852 | "name": "Sebastien MALOT", | 7855 | "name": "Sebastien Malot", |
7853 | "email": "sebastien@malot.fr" | 7856 | "email": "sebastien@malot.fr" |
7854 | } | 7857 | } |
7855 | ], | 7858 | ], |
@@ -9412,8 +9415,8 @@ | |||
9412 | "authors": [ | 9415 | "authors": [ |
9413 | { | 9416 | { |
9414 | "name": "Sander Kromwijk", | 9417 | "name": "Sander Kromwijk", |
9415 | "role": "Original developer", | 9418 | "email": "s.kromwijk@gmail.co", |
9416 | "email": "s.kromwijk@gmail.co" | 9419 | "role": "Original developer" |
9417 | }, | 9420 | }, |
9418 | { | 9421 | { |
9419 | "name": "Nicolas Lœuillet", | 9422 | "name": "Nicolas Lœuillet", |
@@ -9615,7 +9618,7 @@ | |||
9615 | "email": "adrien.brault@gmail.com" | 9618 | "email": "adrien.brault@gmail.com" |
9616 | }, | 9619 | }, |
9617 | { | 9620 | { |
9618 | "name": "William Durand", | 9621 | "name": "William DURAND", |
9619 | "email": "william.durand1@gmail.com" | 9622 | "email": "william.durand1@gmail.com" |
9620 | } | 9623 | } |
9621 | ], | 9624 | ], |
@@ -9665,7 +9668,7 @@ | |||
9665 | ], | 9668 | ], |
9666 | "authors": [ | 9669 | "authors": [ |
9667 | { | 9670 | { |
9668 | "name": "William Durand", | 9671 | "name": "William DURAND", |
9669 | "email": "william.durand1@gmail.com" | 9672 | "email": "william.durand1@gmail.com" |
9670 | } | 9673 | } |
9671 | ], | 9674 | ], |