X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=blobdiff_plain;f=composer.json;h=32a3d1a445a758f40268e21d9ec2a6b1a597418a;hp=dca274ed5b8d659ec188872d23ffe60e6b3967f5;hb=refs%2Fheads%2Fgitolite_local%2Fldap;hpb=7185fbff6294a810727e12ffd6684efe9ddaf75a diff --git a/composer.json b/composer.json index dca274ed..32a3d1a4 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,7 @@ "liip/theme-bundle": "^1.4.6", "lexik/form-filter-bundle": "^5.0.4", "j0k3r/graby": "^1.0", - "friendsofsymfony/user-bundle": "^2.0.1", + "friendsofsymfony/user-bundle": "2.0.*", "friendsofsymfony/oauth-server-bundle": "^1.5.2", "stof/doctrine-extensions-bundle": "^1.2", "scheb/two-factor-bundle": "^2.14.0", @@ -83,15 +83,19 @@ "javibravo/simpleue": "^2.0", "symfony/dom-crawler": "^3.3.13", "friendsofsymfony/jsrouting-bundle": "^1.6.3", - "bdunogier/guzzle-site-authenticator": "^1.0.0@dev", + "bdunogier/guzzle-site-authenticator": "^1.0.0", "defuse/php-encryption": "^2.1", - "html2text/html2text": "^4.1" + "html2text/html2text": "^4.1", + "fr3d/ldap-bundle": "^3.0" + }, + "suggest": { + "fr3d/ldap-bundle": "If you want to authenticate via LDAP" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2", "doctrine/data-fixtures": "~1.1", "sensio/generator-bundle": "^3.0", - "symfony/phpunit-bridge": "^3.3", + "symfony/phpunit-bridge": "3.4.x-dev", "friendsofphp/php-cs-fixer": "~2.0", "m6web/redis-mock": "^2.0", "dama/doctrine-test-bundle": "^4.0"