diff --git a/composer.json b/composer.json index 5a46b2c5..fe9c73a5 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "ocramius/proxy-manager": "2.2.*", "omines/datatables-bundle": "^0.4.0", "php-translation/symfony-bundle": "^0.12.0", - "r/u2f-two-factor-bundle": "dev-u2f-api", + "r/u2f-two-factor-bundle": "^0.7.0", "s9e/text-formatter": "^2.1", "scheb/two-factor-bundle": "^4.11", "sensio/framework-extra-bundle": "^5.1", @@ -116,11 +116,5 @@ "allow-contrib": false, "require": "4.4.*" } - }, - "repositories": [ - { - "type": "vcs", - "url": "git@github.com:stephanvierkant/u2f-two-factor-bundle.git" - } - ] + } } diff --git a/composer.lock b/composer.lock index 228929bd..4f37f16b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "755fbfdb39318d6425c060cf3a52fb61", + "content-hash": "55c83ecede045411cf10d08a4d520473", "packages": [ { "name": "beberlei/assert", @@ -3601,16 +3601,16 @@ }, { "name": "r/u2f-two-factor-bundle", - "version": "dev-u2f-api", + "version": "0.7.0", "source": { "type": "git", - "url": "https://github.com/stephanvierkant/u2f-two-factor-bundle.git", - "reference": "81212afd7897911eb6bbf3f8b315ae336cb3e45b" + "url": "https://github.com/darookee/u2f-two-factor-bundle.git", + "reference": "dcf391e694a8f237883b4c39cfe7367c344c1556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stephanvierkant/u2f-two-factor-bundle/zipball/81212afd7897911eb6bbf3f8b315ae336cb3e45b", - "reference": "81212afd7897911eb6bbf3f8b315ae336cb3e45b", + "url": "https://api.github.com/repos/darookee/u2f-two-factor-bundle/zipball/dcf391e694a8f237883b4c39cfe7367c344c1556", + "reference": "dcf391e694a8f237883b4c39cfe7367c344c1556", "shasum": "" }, "require": { @@ -3636,6 +3636,7 @@ "R\\U2FTwoFactorBundle\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -3652,17 +3653,14 @@ "description": "Use U2F-Keys as 2FA for Symfony2, using scheb/two-factor-bundle", "homepage": "https://github.com/darookee/u2f-two-factor-bundle", "keywords": [ - "authentication", + "Authentication", + "Symfony2", "fido", - "symfony2", "two-factor", "two-step", "yubikey" ], - "support": { - "source": "https://github.com/stephanvierkant/u2f-two-factor-bundle/tree/u2f-api" - }, - "time": "2019-07-17T10:00:04+00:00" + "time": "2019-06-05T14:42:26+00:00" }, { "name": "s9e/regexp-builder", @@ -3841,25 +3839,25 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v5.5.3", + "version": "v5.5.4", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "98f0807137b13d0acfdf3c255a731516e97015de" + "reference": "d0585d4825a87a5030ca8cd34adb4a17e1066c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/98f0807137b13d0acfdf3c255a731516e97015de", - "reference": "98f0807137b13d0acfdf3c255a731516e97015de", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/d0585d4825a87a5030ca8cd34adb4a17e1066c17", + "reference": "d0585d4825a87a5030ca8cd34adb4a17e1066c17", "shasum": "" }, "require": { "doctrine/annotations": "^1.0", "php": ">=7.1.3", - "symfony/config": "^4.3|^5.0", - "symfony/dependency-injection": "^4.3|^5.0", - "symfony/framework-bundle": "^4.3|^5.0", - "symfony/http-kernel": "^4.3|^5.0" + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/framework-bundle": "^4.4|^5.0", + "symfony/http-kernel": "^4.4|^5.0" }, "conflict": { "doctrine/doctrine-cache-bundle": "<1.3.1" @@ -3868,24 +3866,19 @@ "doctrine/doctrine-bundle": "^1.11|^2.0", "doctrine/orm": "^2.5", "nyholm/psr7": "^1.1", - "symfony/browser-kit": "^4.3|^5.0", - "symfony/dom-crawler": "^4.3|^5.0", - "symfony/expression-language": "^4.3|^5.0", - "symfony/finder": "^4.3|^5.0", + "symfony/browser-kit": "^4.4|^5.0", + "symfony/dom-crawler": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/finder": "^4.4|^5.0", "symfony/monolog-bridge": "^4.0|^5.0", "symfony/monolog-bundle": "^3.2", "symfony/phpunit-bridge": "^4.3.5|^5.0", "symfony/psr-http-message-bridge": "^1.1", - "symfony/security-bundle": "^4.3|^5.0", - "symfony/twig-bundle": "^4.3|^5.0", - "symfony/yaml": "^4.3|^5.0", + "symfony/security-bundle": "^4.4|^5.0", + "symfony/twig-bundle": "^4.4|^5.0", + "symfony/yaml": "^4.4|^5.0", "twig/twig": "^1.34|^2.4|^3.0" }, - "suggest": { - "symfony/expression-language": "", - "symfony/psr-http-message-bridge": "To use the PSR-7 converters", - "symfony/security-bundle": "" - }, "type": "symfony-bundle", "extra": { "branch-alias": { @@ -3915,7 +3908,7 @@ "annotations", "controllers" ], - "time": "2019-12-27T08:57:19+00:00" + "time": "2020-04-06T12:20:39+00:00" }, { "name": "sensiolabs/security-checker", @@ -9304,56 +9297,6 @@ ], "time": "2019-11-13T15:46:58+00:00" }, - { - "name": "easycorp/easy-log-handler", - "version": "v1.0.9", - "source": { - "type": "git", - "url": "https://github.com/EasyCorp/easy-log-handler.git", - "reference": "224e1dfcf9455aceee89cd0af306ac097167fac1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/EasyCorp/easy-log-handler/zipball/224e1dfcf9455aceee89cd0af306ac097167fac1", - "reference": "224e1dfcf9455aceee89cd0af306ac097167fac1", - "shasum": "" - }, - "require": { - "monolog/monolog": "~1.6|~2.0", - "php": ">=7.1", - "symfony/yaml": "^3.4|^4.0|^5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "EasyCorp\\EasyLog\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Javier Eguiluz", - "email": "javiereguiluz@gmail.com" - }, - { - "name": "Project Contributors", - "homepage": "https://github.com/EasyCorp/easy-log-handler" - } - ], - "description": "A handler for Monolog that optimizes log messages to be processed by humans instead of software. Improve your productivity with logs that are easy to understand.", - "homepage": "https://github.com/EasyCorp/easy-log-handler", - "keywords": [ - "easy", - "log", - "logging", - "monolog", - "productivity" - ], - "time": "2019-10-24T07:13:31+00:00" - }, { "name": "ekino/phpstan-banned-code", "version": "v0.3.1", @@ -11131,20 +11074,19 @@ }, { "name": "symfony/debug-pack", - "version": "v1.0.7", + "version": "v1.0.8", "source": { "type": "git", "url": "https://github.com/symfony/debug-pack.git", - "reference": "09a4a1e9bf2465987d4f79db0ad6c11cc632bc79" + "reference": "7310a66f9f81c9f292ff9089f0b0062386cb83fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug-pack/zipball/09a4a1e9bf2465987d4f79db0ad6c11cc632bc79", - "reference": "09a4a1e9bf2465987d4f79db0ad6c11cc632bc79", + "url": "https://api.github.com/repos/symfony/debug-pack/zipball/7310a66f9f81c9f292ff9089f0b0062386cb83fb", + "reference": "7310a66f9f81c9f292ff9089f0b0062386cb83fb", "shasum": "" }, "require": { - "easycorp/easy-log-handler": "^1.0.7", "php": "^7.0", "symfony/debug-bundle": "*", "symfony/monolog-bundle": "^3.0", @@ -11157,7 +11099,7 @@ "MIT" ], "description": "A debug pack for Symfony projects", - "time": "2018-12-10T12:11:11+00:00" + "time": "2020-04-07T10:08:51+00:00" }, { "name": "symfony/dom-crawler", @@ -11222,16 +11164,16 @@ }, { "name": "symfony/maker-bundle", - "version": "v1.14.6", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/maker-bundle.git", - "reference": "bc4df88792fbaaeb275167101dc714218475db5f" + "reference": "31396f2e61803f0e2debbb43ba5aa21acbc6e15a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/bc4df88792fbaaeb275167101dc714218475db5f", - "reference": "bc4df88792fbaaeb275167101dc714218475db5f", + "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/31396f2e61803f0e2debbb43ba5aa21acbc6e15a", + "reference": "31396f2e61803f0e2debbb43ba5aa21acbc6e15a", "shasum": "" }, "require": { @@ -11286,7 +11228,7 @@ "scaffold", "scaffolding" ], - "time": "2020-03-04T13:57:29+00:00" + "time": "2020-04-05T10:50:59+00:00" }, { "name": "symfony/phpunit-bridge", @@ -12005,7 +11947,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "r/u2f-two-factor-bundle": 20, "roave/security-advisories": 20 }, "prefer-stable": false, diff --git a/symfony.lock b/symfony.lock index 0f5047d9..fbaf0878 100644 --- a/symfony.lock +++ b/symfony.lock @@ -120,18 +120,6 @@ "doctrine/reflection": { "version": "v1.0.0" }, - "easycorp/easy-log-handler": { - "version": "1.0", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "1.0", - "ref": "70062abc2cd58794d2a90274502f81b55cd9951b" - }, - "files": [ - "./config/packages/dev/easy_log_handler.yaml" - ] - }, "egulias/email-validator": { "version": "2.1.11" },