aboutsummaryrefslogtreecommitdiffhomepage
path: root/composer.lock
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-09-12 16:13:40 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-09-12 16:13:40 +0200
commitfb96ea884532e9804194afd92a98c5c6aecc177e (patch)
treedfcb9a7cd9a1eeac200852ef74f6fc9329e3337c /composer.lock
parent9c08a891f9bb90bc3f23a575a734283c1ee00ba1 (diff)
parentaf43bd37675954f937720f7b6fbcf78d85928bc5 (diff)
downloadwallabag-fb96ea884532e9804194afd92a98c5c6aecc177e.tar.gz
wallabag-fb96ea884532e9804194afd92a98c5c6aecc177e.tar.zst
wallabag-fb96ea884532e9804194afd92a98c5c6aecc177e.zip
Merge pull request #1362 from wallabag/v2-fosuser
implement FosUser
Diffstat (limited to 'composer.lock')
-rw-r--r--composer.lock144
1 files changed, 104 insertions, 40 deletions
diff --git a/composer.lock b/composer.lock
index 35d8b978..7dbb3cd8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "f5520667cebcae76568ff448172854bd", 7 "hash": "d457fa385420eb29a177ac38eac977c3",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "doctrine/annotations", 10 "name": "doctrine/annotations",
@@ -693,16 +693,16 @@
693 }, 693 },
694 { 694 {
695 "name": "doctrine/orm", 695 "name": "doctrine/orm",
696 "version": "v2.5.1", 696 "version": "v2.5.0",
697 "source": { 697 "source": {
698 "type": "git", 698 "type": "git",
699 "url": "https://github.com/doctrine/doctrine2.git", 699 "url": "https://github.com/doctrine/doctrine2.git",
700 "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945" 700 "reference": "aa80c7d2c55a372f5f9f825f5c66dbda53a6e3fe"
701 }, 701 },
702 "dist": { 702 "dist": {
703 "type": "zip", 703 "type": "zip",
704 "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6a83bedbe67579cb0bfb688e982e617943a2945", 704 "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/aa80c7d2c55a372f5f9f825f5c66dbda53a6e3fe",
705 "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945", 705 "reference": "aa80c7d2c55a372f5f9f825f5c66dbda53a6e3fe",
706 "shasum": "" 706 "shasum": ""
707 }, 707 },
708 "require": { 708 "require": {
@@ -766,7 +766,7 @@
766 "database", 766 "database",
767 "orm" 767 "orm"
768 ], 768 ],
769 "time": "2015-08-31 12:59:39" 769 "time": "2015-04-02 20:40:18"
770 }, 770 },
771 { 771 {
772 "name": "ezyang/htmlpurifier", 772 "name": "ezyang/htmlpurifier",
@@ -943,6 +943,73 @@
943 "time": "2015-06-16 08:39:26" 943 "time": "2015-06-16 08:39:26"
944 }, 944 },
945 { 945 {
946 "name": "friendsofsymfony/user-bundle",
947 "version": "dev-master",
948 "source": {
949 "type": "git",
950 "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git",
951 "reference": "336d9cd8ba0c5a462b3e70be144a7bef5377b219"
952 },
953 "dist": {
954 "type": "zip",
955 "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/336d9cd8ba0c5a462b3e70be144a7bef5377b219",
956 "reference": "336d9cd8ba0c5a462b3e70be144a7bef5377b219",
957 "shasum": ""
958 },
959 "require": {
960 "php": ">=5.3.2",
961 "symfony/form": "~2.3",
962 "symfony/framework-bundle": "~2.3",
963 "symfony/security-bundle": "~2.3",
964 "symfony/twig-bundle": "~2.3"
965 },
966 "require-dev": {
967 "doctrine/doctrine-bundle": "~1.3",
968 "swiftmailer/swiftmailer": "~4.3|~5",
969 "symfony/validator": "~2.3",
970 "symfony/yaml": "~2.3",
971 "willdurand/propel-typehintable-behavior": "~1.0"
972 },
973 "suggest": {
974 "willdurand/propel-typehintable-behavior": "Needed when using the propel implementation"
975 },
976 "type": "symfony-bundle",
977 "extra": {
978 "branch-alias": {
979 "dev-master": "2.0.x-dev"
980 }
981 },
982 "autoload": {
983 "psr-4": {
984 "FOS\\UserBundle\\": ""
985 }
986 },
987 "notification-url": "https://packagist.org/downloads/",
988 "license": [
989 "MIT"
990 ],
991 "authors": [
992 {
993 "name": "Christophe Coevoet",
994 "email": "stof@notk.org"
995 },
996 {
997 "name": "FriendsOfSymfony Community",
998 "homepage": "https://github.com/friendsofsymfony/FOSUserBundle/contributors"
999 },
1000 {
1001 "name": "Thibault Duplessis",
1002 "email": "thibault.duplessis@gmail.com"
1003 }
1004 ],
1005 "description": "Symfony FOSUserBundle",
1006 "homepage": "http://friendsofsymfony.github.com",
1007 "keywords": [
1008 "User management"
1009 ],
1010 "time": "2015-08-14 09:45:59"
1011 },
1012 {
946 "name": "guzzlehttp/guzzle", 1013 "name": "guzzlehttp/guzzle",
947 "version": "5.3.0", 1014 "version": "5.3.0",
948 "source": { 1015 "source": {
@@ -2673,37 +2740,32 @@
2673 }, 2740 },
2674 { 2741 {
2675 "name": "symfony/assetic-bundle", 2742 "name": "symfony/assetic-bundle",
2676 "version": "v2.7.0", 2743 "version": "v2.6.1",
2677 "source": { 2744 "source": {
2678 "type": "git", 2745 "type": "git",
2679 "url": "https://github.com/symfony/AsseticBundle.git", 2746 "url": "https://github.com/symfony/AsseticBundle.git",
2680 "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" 2747 "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0"
2681 }, 2748 },
2682 "dist": { 2749 "dist": {
2683 "type": "zip", 2750 "type": "zip",
2684 "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", 2751 "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/422b0add2110f0cf9bc7a873a386ea053f4a89f0",
2685 "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", 2752 "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0",
2686 "shasum": "" 2753 "shasum": ""
2687 }, 2754 },
2688 "require": { 2755 "require": {
2689 "kriswallsmith/assetic": "~1.3", 2756 "kriswallsmith/assetic": "~1.2",
2690 "php": ">=5.3.0", 2757 "php": ">=5.3.0",
2691 "symfony/console": "~2.3", 2758 "symfony/console": "~2.3",
2692 "symfony/dependency-injection": "~2.3", 2759 "symfony/dependency-injection": "~2.3",
2693 "symfony/framework-bundle": "~2.3", 2760 "symfony/framework-bundle": "~2.3",
2694 "symfony/yaml": "~2.3" 2761 "symfony/yaml": "~2.3"
2695 }, 2762 },
2696 "conflict": {
2697 "kriswallsmith/spork": "<=0.2",
2698 "twig/twig": "<1.20"
2699 },
2700 "require-dev": { 2763 "require-dev": {
2701 "kriswallsmith/spork": "~0.3", 2764 "kriswallsmith/spork": "~0.2",
2702 "patchwork/jsqueeze": "~1.0", 2765 "patchwork/jsqueeze": "~1.0",
2703 "symfony/class-loader": "~2.3", 2766 "symfony/class-loader": "~2.3",
2704 "symfony/css-selector": "~2.3", 2767 "symfony/css-selector": "~2.3",
2705 "symfony/dom-crawler": "~2.3", 2768 "symfony/dom-crawler": "~2.3",
2706 "symfony/phpunit-bridge": "~2.7",
2707 "symfony/twig-bundle": "~2.3" 2769 "symfony/twig-bundle": "~2.3"
2708 }, 2770 },
2709 "suggest": { 2771 "suggest": {
@@ -2713,7 +2775,7 @@
2713 "type": "symfony-bundle", 2775 "type": "symfony-bundle",
2714 "extra": { 2776 "extra": {
2715 "branch-alias": { 2777 "branch-alias": {
2716 "dev-master": "2.7-dev" 2778 "dev-master": "2.5-dev"
2717 } 2779 }
2718 }, 2780 },
2719 "autoload": { 2781 "autoload": {
@@ -2739,7 +2801,7 @@
2739 "compression", 2801 "compression",
2740 "minification" 2802 "minification"
2741 ], 2803 ],
2742 "time": "2015-09-01 00:05:29" 2804 "time": "2015-01-27 12:45:16"
2743 }, 2805 },
2744 { 2806 {
2745 "name": "symfony/monolog-bundle", 2807 "name": "symfony/monolog-bundle",
@@ -2859,23 +2921,23 @@
2859 }, 2921 },
2860 { 2922 {
2861 "name": "symfony/symfony", 2923 "name": "symfony/symfony",
2862 "version": "v2.7.4", 2924 "version": "v2.7.3",
2863 "source": { 2925 "source": {
2864 "type": "git", 2926 "type": "git",
2865 "url": "https://github.com/symfony/symfony.git", 2927 "url": "https://github.com/symfony/symfony.git",
2866 "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645" 2928 "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486"
2867 }, 2929 },
2868 "dist": { 2930 "dist": {
2869 "type": "zip", 2931 "type": "zip",
2870 "url": "https://api.github.com/repos/symfony/symfony/zipball/1fdf23fe28876844b887b0e1935c9adda43ee645", 2932 "url": "https://api.github.com/repos/symfony/symfony/zipball/a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486",
2871 "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645", 2933 "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486",
2872 "shasum": "" 2934 "shasum": ""
2873 }, 2935 },
2874 "require": { 2936 "require": {
2875 "doctrine/common": "~2.3", 2937 "doctrine/common": "~2.3",
2876 "php": ">=5.3.9", 2938 "php": ">=5.3.9",
2877 "psr/log": "~1.0", 2939 "psr/log": "~1.0",
2878 "twig/twig": "~1.20|~2.0" 2940 "twig/twig": "~1.18"
2879 }, 2941 },
2880 "replace": { 2942 "replace": {
2881 "symfony/asset": "self.version", 2943 "symfony/asset": "self.version",
@@ -2977,7 +3039,7 @@
2977 "keywords": [ 3039 "keywords": [
2978 "framework" 3040 "framework"
2979 ], 3041 ],
2980 "time": "2015-09-08 14:26:39" 3042 "time": "2015-07-31 13:24:45"
2981 }, 3043 },
2982 { 3044 {
2983 "name": "tecnick.com/tcpdf", 3045 "name": "tecnick.com/tcpdf",
@@ -3044,20 +3106,20 @@
3044 }, 3106 },
3045 { 3107 {
3046 "name": "twig/extensions", 3108 "name": "twig/extensions",
3047 "version": "v1.3.0", 3109 "version": "v1.2.0",
3048 "source": { 3110 "source": {
3049 "type": "git", 3111 "type": "git",
3050 "url": "https://github.com/twigphp/Twig-extensions.git", 3112 "url": "https://github.com/twigphp/Twig-extensions.git",
3051 "reference": "449e3c8a9ffad7c2479c7864557275a32b037499" 3113 "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd"
3052 }, 3114 },
3053 "dist": { 3115 "dist": {
3054 "type": "zip", 3116 "type": "zip",
3055 "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/449e3c8a9ffad7c2479c7864557275a32b037499", 3117 "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
3056 "reference": "449e3c8a9ffad7c2479c7864557275a32b037499", 3118 "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
3057 "shasum": "" 3119 "shasum": ""
3058 }, 3120 },
3059 "require": { 3121 "require": {
3060 "twig/twig": "~1.20|~2.0" 3122 "twig/twig": "~1.12"
3061 }, 3123 },
3062 "require-dev": { 3124 "require-dev": {
3063 "symfony/translation": "~2.3" 3125 "symfony/translation": "~2.3"
@@ -3068,7 +3130,7 @@
3068 "type": "library", 3130 "type": "library",
3069 "extra": { 3131 "extra": {
3070 "branch-alias": { 3132 "branch-alias": {
3071 "dev-master": "1.3-dev" 3133 "dev-master": "1.2.x-dev"
3072 } 3134 }
3073 }, 3135 },
3074 "autoload": { 3136 "autoload": {
@@ -3092,7 +3154,7 @@
3092 "i18n", 3154 "i18n",
3093 "text" 3155 "text"
3094 ], 3156 ],
3095 "time": "2015-08-22 16:38:35" 3157 "time": "2014-10-30 14:30:03"
3096 }, 3158 },
3097 { 3159 {
3098 "name": "twig/twig", 3160 "name": "twig/twig",
@@ -3261,7 +3323,7 @@
3261 ], 3323 ],
3262 "authors": [ 3324 "authors": [
3263 { 3325 {
3264 "name": "William DURAND", 3326 "name": "William Durand",
3265 "email": "william.durand1@gmail.com" 3327 "email": "william.durand1@gmail.com"
3266 } 3328 }
3267 ], 3329 ],
@@ -3346,7 +3408,7 @@
3346 ], 3408 ],
3347 "authors": [ 3409 "authors": [
3348 { 3410 {
3349 "name": "William DURAND", 3411 "name": "William Durand",
3350 "email": "william.durand1@gmail.com" 3412 "email": "william.durand1@gmail.com"
3351 } 3413 }
3352 ], 3414 ],
@@ -3828,16 +3890,16 @@
3828 }, 3890 },
3829 { 3891 {
3830 "name": "phpunit/phpunit", 3892 "name": "phpunit/phpunit",
3831 "version": "4.8.6", 3893 "version": "4.8.5",
3832 "source": { 3894 "source": {
3833 "type": "git", 3895 "type": "git",
3834 "url": "https://github.com/sebastianbergmann/phpunit.git", 3896 "url": "https://github.com/sebastianbergmann/phpunit.git",
3835 "reference": "2246830f4a1a551c67933e4171bf2126dc29d357" 3897 "reference": "9b7417edaf28059ea63d86be941e6004dbfcc0cc"
3836 }, 3898 },
3837 "dist": { 3899 "dist": {
3838 "type": "zip", 3900 "type": "zip",
3839 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2246830f4a1a551c67933e4171bf2126dc29d357", 3901 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b7417edaf28059ea63d86be941e6004dbfcc0cc",
3840 "reference": "2246830f4a1a551c67933e4171bf2126dc29d357", 3902 "reference": "9b7417edaf28059ea63d86be941e6004dbfcc0cc",
3841 "shasum": "" 3903 "shasum": ""
3842 }, 3904 },
3843 "require": { 3905 "require": {
@@ -3896,7 +3958,7 @@
3896 "testing", 3958 "testing",
3897 "xunit" 3959 "xunit"
3898 ], 3960 ],
3899 "time": "2015-08-24 04:09:38" 3961 "time": "2015-08-19 09:20:57"
3900 }, 3962 },
3901 { 3963 {
3902 "name": "phpunit/phpunit-mock-objects", 3964 "name": "phpunit/phpunit-mock-objects",
@@ -4376,7 +4438,9 @@
4376 ], 4438 ],
4377 "aliases": [], 4439 "aliases": [],
4378 "minimum-stability": "dev", 4440 "minimum-stability": "dev",
4379 "stability-flags": [], 4441 "stability-flags": {
4442 "friendsofsymfony/user-bundle": 20
4443 },
4380 "prefer-stable": true, 4444 "prefer-stable": true,
4381 "prefer-lowest": false, 4445 "prefer-lowest": false,
4382 "platform": { 4446 "platform": {