From 8ba854c068f541039d81524d171769b6e1220171 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 31 Dec 2015 18:51:35 +0100 Subject: [PATCH] TwoFactorBundle -> 2.0 --- composer.json | 2 +- composer.lock | 154 ++++++++++++++++++++++++++------------------------ 2 files changed, 81 insertions(+), 75 deletions(-) diff --git a/composer.json b/composer.json index 3a32c02f..2a5928e3 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "friendsofsymfony/user-bundle": "dev-master", "friendsofsymfony/oauth-server-bundle": "^1.4@dev", "stof/doctrine-extensions-bundle": "^1.2@dev", - "scheb/two-factor-bundle": "~1.4.0", + "scheb/two-factor-bundle": "~2.0", "grandt/phpepub": "~4.0", "wallabag/php-mobi": "~1.0.0", "kphoen/rulerz-bundle": "~0.10", diff --git a/composer.lock b/composer.lock index 305194cd..94b40ac8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "42bbd48a9c971aee0011808edfb08915", - "content-hash": "6e0d8bfeb719303796b0f13b28eadb86", + "hash": "eac49c76ef42a2e10cd4f228983c1d55", + "content-hash": "f1d311928f3a196b2d192e5e451217d1", "packages": [ { "name": "behat/transliterator", @@ -117,16 +117,16 @@ }, { "name": "doctrine/cache", - "version": "v1.5.4", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136" + "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136", - "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136", + "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6", + "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6", "shasum": "" }, "require": { @@ -183,7 +183,7 @@ "cache", "caching" ], - "time": "2015-12-19 05:03:47" + "time": "2015-12-31 16:37:02" }, { "name": "doctrine/collections", @@ -1106,17 +1106,17 @@ }, { "name": "friendsofsymfony/rest-bundle", - "version": "1.7.6", + "version": "1.7.7", "target-dir": "FOS/RestBundle", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "f95b2f141748e9a5e2ddae833f60c38417aee8c3" + "reference": "c79b7e5df96e5581591ceb6a026bd4e5f9346de0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/f95b2f141748e9a5e2ddae833f60c38417aee8c3", - "reference": "f95b2f141748e9a5e2ddae833f60c38417aee8c3", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/c79b7e5df96e5581591ceb6a026bd4e5f9346de0", + "reference": "c79b7e5df96e5581591ceb6a026bd4e5f9346de0", "shasum": "" }, "require": { @@ -1188,7 +1188,7 @@ "keywords": [ "rest" ], - "time": "2015-12-20 13:45:30" + "time": "2015-12-29 16:02:50" }, { "name": "friendsofsymfony/user-bundle", @@ -2169,16 +2169,16 @@ }, { "name": "hoa/stream", - "version": "0.15.08.28", + "version": "0.15.10.26", "source": { "type": "git", "url": "https://github.com/hoaproject/Stream.git", - "reference": "cbd0f4749e447f4d31001e7c898f5e794c5861cb" + "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Stream/zipball/cbd0f4749e447f4d31001e7c898f5e794c5861cb", - "reference": "cbd0f4749e447f4d31001e7c898f5e794c5861cb", + "url": "https://api.github.com/repos/hoaproject/Stream/zipball/011ab91d942f1d7096deade4c8a10fe57d51c5b3", + "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3", "shasum": "" }, "require": { @@ -2223,7 +2223,7 @@ "stream", "wrapper" ], - "time": "2015-08-28 07:31:43" + "time": "2015-10-22 06:30:43" }, { "name": "hoa/ustring", @@ -2480,16 +2480,16 @@ }, { "name": "j0k3r/graby", - "version": "1.0.7", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/j0k3r/graby.git", - "reference": "301f8c492be4c9b2bed8f29c32641636de0eca0a" + "reference": "bf152ccc6629bdd63b1e5e8b297c2912516b5f1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby/zipball/301f8c492be4c9b2bed8f29c32641636de0eca0a", - "reference": "301f8c492be4c9b2bed8f29c32641636de0eca0a", + "url": "https://api.github.com/repos/j0k3r/graby/zipball/bf152ccc6629bdd63b1e5e8b297c2912516b5f1e", + "reference": "bf152ccc6629bdd63b1e5e8b297c2912516b5f1e", "shasum": "" }, "require": { @@ -2532,20 +2532,20 @@ } ], "description": "Graby helps you extract article content from web pages", - "time": "2015-12-16 10:21:48" + "time": "2015-12-24 08:28:38" }, { "name": "j0k3r/graby-site-config", - "version": "1.0.10", + "version": "1.0.11", "source": { "type": "git", "url": "https://github.com/j0k3r/graby-site-config.git", - "reference": "daea5cdd2c3d89cb90402205392423030f8eebce" + "reference": "ac198f308beabccc97bbd35ed0daeaac63fbf1e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/daea5cdd2c3d89cb90402205392423030f8eebce", - "reference": "daea5cdd2c3d89cb90402205392423030f8eebce", + "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/ac198f308beabccc97bbd35ed0daeaac63fbf1e3", + "reference": "ac198f308beabccc97bbd35ed0daeaac63fbf1e3", "shasum": "" }, "require": { @@ -2568,7 +2568,7 @@ } ], "description": "Graby site config files", - "time": "2015-12-16 10:27:19" + "time": "2015-12-23 22:52:15" }, { "name": "j0k3r/php-readability", @@ -3987,26 +3987,27 @@ }, { "name": "scheb/two-factor-bundle", - "version": "v1.4.7", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/scheb/two-factor-bundle.git", - "reference": "ef6830dbbf62b22efd335db8f64bf0f51d4284a2" + "reference": "27c8e3530c077bbfb2a5312dd8fc3005f26c0fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/ef6830dbbf62b22efd335db8f64bf0f51d4284a2", - "reference": "ef6830dbbf62b22efd335db8f64bf0f51d4284a2", + "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/27c8e3530c077bbfb2a5312dd8fc3005f26c0fc4", + "reference": "27c8e3530c077bbfb2a5312dd8fc3005f26c0fc4", "shasum": "" }, "require": { + "paragonie/random_compat": "~1.0", "sonata-project/google-authenticator": "~1.0", - "symfony/symfony": "~2.1" + "symfony/symfony": "~2.6|~3.0" }, "require-dev": { "satooshi/php-coveralls": "~0.6", "swiftmailer/swiftmailer": ">=4.3, <6.0", - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "~2.7|~3.0" }, "type": "symfony-bundle", "autoload": { @@ -4024,15 +4025,16 @@ "email": "me@christianscheb.de" } ], - "description": "Provides two-factor authenticaton for Symfony2", + "description": "Provides two-factor authentication for Symfony applications", "homepage": "https://github.com/scheb/two-factor-bundle", "keywords": [ "Authentication", - "Symfony2", + "security", + "symfony", "two-factor", "two-step" ], - "time": "2015-08-25 19:58:00" + "time": "2015-12-31 17:20:20" }, { "name": "sensio/distribution-bundle", @@ -4577,7 +4579,7 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", @@ -4632,21 +4634,24 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0b6a8940385311a24e060ec1fe35680e17c74497" + "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497", - "reference": "0b6a8940385311a24e060ec1fe35680e17c74497", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", + "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "suggest": { + "ext-mbstring": "For best performance" + }, "type": "library", "extra": { "branch-alias": { @@ -4684,11 +4689,11 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2015-11-20 09:19:13" }, { "name": "symfony/polyfill-php54", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", @@ -4746,7 +4751,7 @@ }, { "name": "symfony/polyfill-php55", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", @@ -4802,16 +4807,16 @@ }, { "name": "symfony/polyfill-php56", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "a6bd4770a6967517e6610529e14afaa3111094a3" + "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/a6bd4770a6967517e6610529e14afaa3111094a3", - "reference": "a6bd4770a6967517e6610529e14afaa3111094a3", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", + "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", "shasum": "" }, "require": { @@ -4854,11 +4859,11 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2015-12-18 15:10:25" }, { "name": "symfony/polyfill-php70", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", @@ -4917,7 +4922,7 @@ }, { "name": "symfony/polyfill-util", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", @@ -4969,26 +4974,27 @@ }, { "name": "symfony/security-acl", - "version": "v2.7.7", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/security-acl.git", - "reference": "9aec8062e33fca5e08d2a78669b2222252e8c3b6" + "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-acl/zipball/9aec8062e33fca5e08d2a78669b2222252e8c3b6", - "reference": "9aec8062e33fca5e08d2a78669b2222252e8c3b6", + "url": "https://api.github.com/repos/symfony/security-acl/zipball/4a3f7327ad215242c78f6564ad4ea6d2db1b8347", + "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347", "shasum": "" }, "require": { "php": ">=5.3.9", - "symfony/security-core": "~2.4" + "symfony/security-core": "~2.4|~3.0.0" }, "require-dev": { "doctrine/common": "~2.2", "doctrine/dbal": "~2.2", - "psr/log": "~1.0" + "psr/log": "~1.0", + "symfony/phpunit-bridge": "~2.7|~3.0.0" }, "suggest": { "doctrine/dbal": "For using the built-in ACL implementation", @@ -4998,7 +5004,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -5025,7 +5031,7 @@ ], "description": "Symfony Security Component - ACL (Access Control List)", "homepage": "https://symfony.com", - "time": "2015-11-18 13:41:01" + "time": "2015-12-28 09:39:09" }, { "name": "symfony/swiftmailer-bundle", @@ -5086,16 +5092,16 @@ }, { "name": "symfony/symfony", - "version": "v2.8.0", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "5615b92cd452cd54f1433a3f53de87c096a1107f" + "reference": "8956ed50a44c5c4e02f2176c0773e24487477b09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/5615b92cd452cd54f1433a3f53de87c096a1107f", - "reference": "5615b92cd452cd54f1433a3f53de87c096a1107f", + "url": "https://api.github.com/repos/symfony/symfony/zipball/8956ed50a44c5c4e02f2176c0773e24487477b09", + "reference": "8956ed50a44c5c4e02f2176c0773e24487477b09", "shasum": "" }, "require": { @@ -5215,7 +5221,7 @@ "keywords": [ "framework" ], - "time": "2015-11-30 17:26:10" + "time": "2015-12-26 15:56:52" }, { "name": "tecnickcom/tcpdf", @@ -6611,16 +6617,16 @@ }, { "name": "sensio/generator-bundle", - "version": "v3.0.3", + "version": "v3.0.4", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "525e078ff7d5e9f19b0ef912bb6d6753673b3c66" + "reference": "e8d4db2fd6cd61e62208bda8f4f629e557f6acef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/525e078ff7d5e9f19b0ef912bb6d6753673b3c66", - "reference": "525e078ff7d5e9f19b0ef912bb6d6753673b3c66", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e8d4db2fd6cd61e62208bda8f4f629e557f6acef", + "reference": "e8d4db2fd6cd61e62208bda8f4f629e557f6acef", "shasum": "" }, "require": { @@ -6659,20 +6665,20 @@ } ], "description": "This bundle generates code for you", - "time": "2015-12-20 20:01:41" + "time": "2015-12-28 16:09:21" }, { "name": "symfony/phpunit-bridge", - "version": "v2.8.0", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "fb79ac646c342fdff19864619943a6c58bb28893" + "reference": "2deb2ccbe184948ae4e85e7b99e962738d3d2d69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/fb79ac646c342fdff19864619943a6c58bb28893", - "reference": "fb79ac646c342fdff19864619943a6c58bb28893", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/2deb2ccbe184948ae4e85e7b99e962738d3d2d69", + "reference": "2deb2ccbe184948ae4e85e7b99e962738d3d2d69", "shasum": "" }, "require": { @@ -6714,7 +6720,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2015-11-27 22:51:43" + "time": "2015-12-11 08:57:52" } ], "aliases": [], -- 2.41.0