diff --git a/composer.json b/composer.json index e84f10be..6de986e6 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "surfnet/yubikey-api-client-bundle": "dev-develop", "surfnet/stepup-bundle": "dev-develop", "surfnet/stepup-saml-bundle": "dev-develop", - "surfnet/stepup-u2f-bundle": "dev-develop" + "surfnet/stepup-u2f-bundle": "dev-develop", + "mopa/composer-bridge": "dev-master as v1.5.0" }, "require-dev": { "sensio/generator-bundle": "~2.3", diff --git a/composer.lock b/composer.lock index 47c09664..5acff1a2 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": "78aa6916a2284e09c6f37b1ac62dfbea", - "content-hash": "491e30a3a2ead698f1e071d18c300628", + "hash": "29c9b85ae0f3ff86ef7a1b03e139857f", + "content-hash": "91289e488e25bf569f2e6bd26ecfc003", "packages": [ { "name": "doctrine/annotations", @@ -1754,20 +1754,21 @@ }, { "name": "mopa/composer-bridge", - "version": "v1.3.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/phiamo/MopaComposerBridge.git", - "reference": "4ce791bfeabc5261da11cf4a949745d60dae711f" + "reference": "58661a5c588ce9c3eff7d36c4030f6caa4de1ae2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phiamo/MopaComposerBridge/zipball/4ce791bfeabc5261da11cf4a949745d60dae711f", - "reference": "4ce791bfeabc5261da11cf4a949745d60dae711f", + "url": "https://api.github.com/repos/phiamo/MopaComposerBridge/zipball/58661a5c588ce9c3eff7d36c4030f6caa4de1ae2", + "reference": "58661a5c588ce9c3eff7d36c4030f6caa4de1ae2", "shasum": "" }, "require": { - "symfony/console": "2.*" + "symfony/class-loader": ">=2.0.0", + "symfony/console": ">=2.0.0" }, "type": "symfony-bridge", "extra": { @@ -1785,14 +1786,13 @@ "MIT" ], "authors": [ - { - "name": "Philipp A. Mohrenweiser", - "email": "phiamo@googlemail.com", - "homepage": "http://bootstrap.mohrenweiserpartner.de" - }, { "name": "Community contributions", "homepage": "https://github.com/phiamo/MopaComposerBridge/contributors" + }, + { + "name": "Philipp A. Mohrenweiser", + "email": "phiamo@googlemail.com" } ], "description": "Symfony2 Composer Bridge", @@ -1801,7 +1801,7 @@ "Symfony2", "composer" ], - "time": "2013-09-10 10:06:34" + "time": "2015-10-01 19:20:19" }, { "name": "nelmio/security-bundle", @@ -2290,7 +2290,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SURFnet/Stepup-saml-bundle/zipball/4dde80135a11844ab4e5ba8eec3602194c49a67d", + "url": "https://api.github.com/repos/SURFnet/Stepup-saml-bundle/zipball/f8b6257f7b5ca5ddc21da2c89207bec1ce2bdd5e", "reference": "53b7fd0198a1e9de2504a3762af499f744ad222d", "shasum": "" }, @@ -2473,12 +2473,12 @@ "version": "v2.6.1", "source": { "type": "git", - "url": "https://github.com/symfony/AsseticBundle.git", + "url": "https://github.com/symfony/assetic-bundle.git", "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/422b0add2110f0cf9bc7a873a386ea053f4a89f0", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/422b0add2110f0cf9bc7a873a386ea053f4a89f0", "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0", "shasum": "" }, @@ -2538,12 +2538,12 @@ "version": "v2.6.1", "source": { "type": "git", - "url": "https://github.com/symfony/MonologBundle.git", + "url": "https://github.com/symfony/monolog-bundle.git", "reference": "227bbeefe30f2d95e3fe5fbd1ccda414287a957a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/227bbeefe30f2d95e3fe5fbd1ccda414287a957a", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/227bbeefe30f2d95e3fe5fbd1ccda414287a957a", "reference": "227bbeefe30f2d95e3fe5fbd1ccda414287a957a", "shasum": "" }, @@ -2598,12 +2598,12 @@ "target-dir": "Symfony/Bundle/SwiftmailerBundle", "source": { "type": "git", - "url": "https://github.com/symfony/SwiftmailerBundle.git", + "url": "https://github.com/symfony/swiftmailer-bundle.git", "reference": "e98defd402f72e8b54a029ba4d3ac4cb51dc3577" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/e98defd402f72e8b54a029ba4d3ac4cb51dc3577", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/e98defd402f72e8b54a029ba4d3ac4cb51dc3577", "reference": "e98defd402f72e8b54a029ba4d3ac4cb51dc3577", "shasum": "" }, @@ -4690,7 +4690,14 @@ "time": "2013-12-21 17:10:13" } ], - "aliases": [], + "aliases": [ + { + "alias": "v1.5.0", + "alias_normalized": "1.5.0.0", + "version": "9999999-dev", + "package": "mopa/composer-bridge" + } + ], "minimum-stability": "stable", "stability-flags": { "doctrine/migrations": 15, @@ -4699,7 +4706,8 @@ "surfnet/yubikey-api-client-bundle": 20, "surfnet/stepup-bundle": 20, "surfnet/stepup-saml-bundle": 20, - "surfnet/stepup-u2f-bundle": 20 + "surfnet/stepup-u2f-bundle": 20, + "mopa/composer-bridge": 20 }, "prefer-stable": false, "prefer-lowest": false,