From 18400ed5e0abb477173fd3a0beddb63b627db513 Mon Sep 17 00:00:00 2001 From: Phillip Shipley Date: Wed, 6 Dec 2017 14:19:43 -0500 Subject: [PATCH 1/2] updating passwordstore-id-broker --- application/composer.json | 2 +- application/composer.lock | 297 ++++++++++++++++++++------------------ 2 files changed, 156 insertions(+), 143 deletions(-) diff --git a/application/composer.json b/application/composer.json index 2845edf4..5c7eb1a8 100644 --- a/application/composer.json +++ b/application/composer.json @@ -25,7 +25,7 @@ "silinternational/idp-pw-api-personnel-multiple": "^1.0.0", "silinternational/idp-pw-api-auth-saml": "^1.0.1", "silinternational/idp-pw-api-passwordstore-ldap": "^2.1", - "silinternational/idp-pw-api-passwordstore-id-broker": "^3.2.0", + "silinternational/idp-pw-api-passwordstore-id-broker": "dev-develop", "silinternational/idp-pw-api-passwordstore-multiple": "^1.0.1", "silinternational/idp-pw-api-phoneverification-nexmo": "^2.0", "silinternational/zxcvbn-api-client-php": "^2.0", diff --git a/application/composer.lock b/application/composer.lock index 65c0bfc2..3346faae 100644 --- a/application/composer.lock +++ b/application/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "32750135b479b7765c635a2422c86866", + "content-hash": "8f64af2de52e7df39b29a642446c319f", "packages": [ { "name": "adldap2/adldap2", @@ -1309,22 +1309,22 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "bf2267389f86ae9a168fd0166be59d36ffc07827" + "reference": "497fce9103b12b99e8d166bc466d015f5b07c0d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/bf2267389f86ae9a168fd0166be59d36ffc07827", - "reference": "bf2267389f86ae9a168fd0166be59d36ffc07827", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/497fce9103b12b99e8d166bc466d015f5b07c0d8", + "reference": "497fce9103b12b99e8d166bc466d015f5b07c0d8", "shasum": "" }, "conflict": { "adodb/adodb-php": "<5.20.6", - "amphp/artax": ">=2,<2.0.6|<1.0.6", + "amphp/artax": "<1.0.6|>=2,<2.0.6", "aws/aws-sdk-php": ">=3,<3.2.1", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", - "cakephp/cakephp": ">=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.0.15|>=3.1,<3.1.4|>=1.3,<1.3.18", + "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.0.15|>=3.1,<3.1.4", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", - "cartalyst/sentry": "<2.1", + "cartalyst/sentry": "<=2.1.6", "codeigniter/framework": "<=3.0.6", "composer/composer": "<=1.0.0-alpha11", "contao-components/mediaelement": ">=2.14.2,<2.21.1", @@ -1343,7 +1343,7 @@ "dompdf/dompdf": ">=0.6,<0.6.2", "drupal/core": ">=8,<8.3.7", "drupal/drupal": ">=8,<8.3.7", - "ezsystems/ezpublish-legacy": ">=2017.8,<2017.8.1.1|>=5.4,<5.4.10.1|>=5.3,<5.3.12.2", + "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.2|>=5.4,<5.4.10.1|>=2017.8,<2017.8.1.1", "firebase/php-jwt": "<2", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", @@ -1363,7 +1363,7 @@ "oro/crm": ">=1.7,<1.7.4", "oro/platform": ">=1.7,<1.7.4", "phpmailer/phpmailer": ">=5,<5.2.24", - "phpunit/phpunit": ">=5.0.10,<5.6.3|>=4.8.19,<4.8.28", + "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", "phpxmlrpc/extras": "<6.0.1", "pusher/pusher-php-server": "<2.2.1", "sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9", @@ -1379,16 +1379,16 @@ "squizlabs/php_codesniffer": ">=1,<2.8.1", "swiftmailer/swiftmailer": ">=4,<5.4.5", "symfony/dependency-injection": ">=2,<2.0.17", - "symfony/form": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13|>=2.3,<2.3.35|>=2.4,<2.6.12", + "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2", "symfony/http-foundation": ">=2,<2.3.27|>=2.4,<2.5.11|>=2.6,<2.6.6", "symfony/http-kernel": ">=2,<2.3.29|>=2.4,<2.5.12|>=2.6,<2.6.8", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/routing": ">=2,<2.0.19", - "symfony/security": ">=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5|>=2.3,<2.3.37|>=2.4,<2.6.13|>=2.7,<2.7.9|>=2,<2.0.25|>=2.1,<2.1.13|>=2.2,<2.2.9", - "symfony/security-core": ">=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5|>=2.4,<2.6.13|>=2.7,<2.7.9|>=2.8,<2.8.6|>=3,<3.0.6", + "symfony/security": ">=2,<2.0.25|>=2.1,<2.1.13|>=2.2,<2.2.9|>=2.3,<2.3.37|>=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5", + "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<2.8.6|>=2.8.23,<2.8.25|>=3,<3.0.6|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5", "symfony/security-csrf": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", - "symfony/security-http": ">=2.4,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13|>=2.3,<2.3.41", + "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/serializer": ">=2,<2.0.11", "symfony/symfony": ">=2,<2.3.41|>=2.4,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/translation": ">=2,<2.0.17", @@ -1399,8 +1399,8 @@ "thelia/thelia": ">=2.1,<2.1.2|>=2.1.0-beta1,<2.1.3", "twig/twig": "<1.20", "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.22|>=8,<8.7.5", - "typo3/flow": ">=1,<1.0.4|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5|>=1.1,<1.1.1|>=2,<2.0.1", - "typo3/neos": ">=1.2,<1.2.13|>=2,<2.0.4|>=1.1,<1.1.3", + "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5", + "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4", "willdurand/js-translation-bundle": "<2.1.1", "yiisoft/yii": ">=1.1.14,<1.1.15", "yiisoft/yii2": "<2.0.5", @@ -1445,7 +1445,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2017-11-17T12:15:33+00:00" + "time": "2017-12-05T17:52:25+00:00" }, { "name": "robrichards/xmlseclibs", @@ -1543,16 +1543,16 @@ }, { "name": "silinternational/idp-id-broker-php-client", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/silinternational/idp-id-broker-php-client.git", - "reference": "c997c09968988be3d6c06d8f3c8e11c9a7816c14" + "reference": "75c8c9bb510f7f5f6ff4b9363bbc6e47470e8476" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silinternational/idp-id-broker-php-client/zipball/c997c09968988be3d6c06d8f3c8e11c9a7816c14", - "reference": "c997c09968988be3d6c06d8f3c8e11c9a7816c14", + "url": "https://api.github.com/repos/silinternational/idp-id-broker-php-client/zipball/75c8c9bb510f7f5f6ff4b9363bbc6e47470e8476", + "reference": "75c8c9bb510f7f5f6ff4b9363bbc6e47470e8476", "shasum": "" }, "require": { @@ -1594,7 +1594,7 @@ "idp", "php client" ], - "time": "2017-11-21T18:55:38+00:00" + "time": "2017-12-06T18:41:45+00:00" }, { "name": "silinternational/idp-pw-api-auth-saml", @@ -1679,22 +1679,22 @@ }, { "name": "silinternational/idp-pw-api-passwordstore-id-broker", - "version": "3.2.0", + "version": "dev-develop", "source": { "type": "git", "url": "https://github.com/silinternational/idp-pw-api-passwordstore-id-broker.git", - "reference": "496b6d6d38de85baec61ec7b40946bcca65fd724" + "reference": "f9b74a7b59f4249aecdc9c1e4045d82da9802c55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silinternational/idp-pw-api-passwordstore-id-broker/zipball/496b6d6d38de85baec61ec7b40946bcca65fd724", - "reference": "496b6d6d38de85baec61ec7b40946bcca65fd724", + "url": "https://api.github.com/repos/silinternational/idp-pw-api-passwordstore-id-broker/zipball/f9b74a7b59f4249aecdc9c1e4045d82da9802c55", + "reference": "f9b74a7b59f4249aecdc9c1e4045d82da9802c55", "shasum": "" }, "require": { "fillup/fake-bower-assets": "^2.0.9", "php": ">=7.0.0", - "silinternational/idp-id-broker-php-client": "^2.2.0", + "silinternational/idp-id-broker-php-client": "^2.4.0", "silinternational/idp-pw-api-common": "^1.0" }, "require-dev": { @@ -1720,7 +1720,7 @@ } ], "description": "Id Broker Password Store component for IdP PW API", - "time": "2017-11-09T16:18:39+00:00" + "time": "2017-12-06T19:05:19+00:00" }, { "name": "silinternational/idp-pw-api-passwordstore-ldap", @@ -2391,16 +2391,16 @@ }, { "name": "symfony/translation", - "version": "v3.3.13", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "373e553477e55cd08f8b86b74db766c75b987fdb" + "reference": "e05b0a5996ad7a35ba3a19ffad8b72c9daa64dfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/373e553477e55cd08f8b86b74db766c75b987fdb", - "reference": "373e553477e55cd08f8b86b74db766c75b987fdb", + "url": "https://api.github.com/repos/symfony/translation/zipball/e05b0a5996ad7a35ba3a19ffad8b72c9daa64dfa", + "reference": "e05b0a5996ad7a35ba3a19ffad8b72c9daa64dfa", "shasum": "" }, "require": { @@ -2409,13 +2409,16 @@ }, "conflict": { "symfony/config": "<2.8", - "symfony/yaml": "<3.3" + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/intl": "^2.8.18|^3.2.5", - "symfony/yaml": "~3.3" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "psr/log": "To use logging capability in translator", @@ -2425,7 +2428,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2452,7 +2455,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-11-07T14:12:55+00:00" + "time": "2017-11-27T14:23:00+00:00" }, { "name": "yiisoft/yii2", @@ -3300,29 +3303,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.1.1", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2" + "reference": "66465776cfc249844bde6d117abff1d22e06c2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2", - "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da", + "reference": "66465776cfc249844bde6d117abff1d22e06c2da", "shasum": "" }, "require": { "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/reflection-common": "^1.0.0", "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -3341,7 +3350,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-30T18:51:59+00:00" + "time": "2017-11-27T17:38:31+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -3392,16 +3401,16 @@ }, { "name": "phpspec/prophecy", - "version": "v1.7.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" + "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", - "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", + "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", "shasum": "" }, "require": { @@ -3413,7 +3422,7 @@ }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8 || ^5.6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7" }, "type": "library", "extra": { @@ -3451,20 +3460,20 @@ "spy", "stub" ], - "time": "2017-09-04T11:05:03+00:00" + "time": "2017-11-24T13:59:53+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "5.2.3", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d" + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d", - "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", "shasum": "" }, "require": { @@ -3473,14 +3482,13 @@ "php": "^7.0", "phpunit/php-file-iterator": "^1.4.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^2.0", + "phpunit/php-token-stream": "^2.0.1", "sebastian/code-unit-reverse-lookup": "^1.0.1", "sebastian/environment": "^3.0", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, "require-dev": { - "ext-xdebug": "^2.5", "phpunit/phpunit": "^6.0" }, "suggest": { @@ -3489,7 +3497,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2.x-dev" + "dev-master": "5.3.x-dev" } }, "autoload": { @@ -3504,7 +3512,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -3515,20 +3523,20 @@ "testing", "xunit" ], - "time": "2017-11-03T13:47:33+00:00" + "time": "2017-12-06T09:29:45+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.2", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "shasum": "" }, "require": { @@ -3562,7 +3570,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03T07:40:28+00:00" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -3656,16 +3664,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0" + "reference": "791198a2c6254db10131eecfe8c06670700904db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0", - "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", + "reference": "791198a2c6254db10131eecfe8c06670700904db", "shasum": "" }, "require": { @@ -3701,7 +3709,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-08-20T05:47:52+00:00" + "time": "2017-11-27T05:48:46+00:00" }, { "name": "phpunit/phpunit", @@ -4452,25 +4460,25 @@ }, { "name": "symfony/browser-kit", - "version": "v3.3.13", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "03f957cd24bf939524f07b8b910c89cfcad722a8" + "reference": "179522b5f0b5e6d00bb60f38a4d6b29962e4b61b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/03f957cd24bf939524f07b8b910c89cfcad722a8", - "reference": "03f957cd24bf939524f07b8b910c89cfcad722a8", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/179522b5f0b5e6d00bb60f38a4d6b29962e4b61b", + "reference": "179522b5f0b5e6d00bb60f38a4d6b29962e4b61b", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8", - "symfony/dom-crawler": "~2.8|~3.0" + "symfony/dom-crawler": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/css-selector": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/process": "" @@ -4478,7 +4486,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -4505,48 +4513,49 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-11-07T14:12:55+00:00" + "time": "2017-11-07T14:20:24+00:00" }, { "name": "symfony/console", - "version": "v3.3.13", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805" + "reference": "2cdef78de8f54f68ff16a857e710e7302b47d4c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/63cd7960a0a522c3537f6326706d7f3b8de65805", - "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805", + "url": "https://api.github.com/repos/symfony/console/zipball/2cdef78de8f54f68ff16a857e710e7302b47d4c7", + "reference": "2cdef78de8f54f68ff16a857e710e7302b47d4c7", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3", - "symfony/dependency-injection": "~3.3", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.3|~4.0" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", - "symfony/filesystem": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -4573,20 +4582,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-11-16T15:24:32+00:00" + "time": "2017-12-02T18:20:11+00:00" }, { "name": "symfony/css-selector", - "version": "v3.3.13", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "66e6e046032ebdf1f562c26928549f613d428bd1" + "reference": "7134b93e90ea7e7881fcb2da006d21b4c5f31908" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/66e6e046032ebdf1f562c26928549f613d428bd1", - "reference": "66e6e046032ebdf1f562c26928549f613d428bd1", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/7134b93e90ea7e7881fcb2da006d21b4c5f31908", + "reference": "7134b93e90ea7e7881fcb2da006d21b4c5f31908", "shasum": "" }, "require": { @@ -4595,7 +4604,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -4626,20 +4635,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-11-05T15:47:03+00:00" + "time": "2017-11-05T16:10:10+00:00" }, { "name": "symfony/debug", - "version": "v3.3.13", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "74557880e2846b5c84029faa96b834da37e29810" + "reference": "fb2001e5d85f95d8b6ab94ae3be5d2672df128fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/74557880e2846b5c84029faa96b834da37e29810", - "reference": "74557880e2846b5c84029faa96b834da37e29810", + "url": "https://api.github.com/repos/symfony/debug/zipball/fb2001e5d85f95d8b6ab94ae3be5d2672df128fd", + "reference": "fb2001e5d85f95d8b6ab94ae3be5d2672df128fd", "shasum": "" }, "require": { @@ -4650,12 +4659,12 @@ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -4682,20 +4691,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-11-10T16:38:39+00:00" + "time": "2017-11-21T09:01:46+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.3.13", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "cebe3c068867956e012d9135282ba6a05d8a259e" + "reference": "7bf68716e400997a291ad42c9f9fe7972e6656d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/cebe3c068867956e012d9135282ba6a05d8a259e", - "reference": "cebe3c068867956e012d9135282ba6a05d8a259e", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7bf68716e400997a291ad42c9f9fe7972e6656d2", + "reference": "7bf68716e400997a291ad42c9f9fe7972e6656d2", "shasum": "" }, "require": { @@ -4703,7 +4712,7 @@ "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0" + "symfony/css-selector": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/css-selector": "" @@ -4711,7 +4720,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -4738,20 +4747,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-11-05T15:47:03+00:00" + "time": "2017-11-05T16:10:10+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.3.13", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "271d8c27c3ec5ecee6e2ac06016232e249d638d9" + "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/271d8c27c3ec5ecee6e2ac06016232e249d638d9", - "reference": "271d8c27c3ec5ecee6e2ac06016232e249d638d9", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ca20b8f9ef149f40ff656d52965f240d85f7a8e4", + "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4", "shasum": "" }, "require": { @@ -4762,10 +4771,10 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -4774,7 +4783,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -4801,20 +4810,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-11-05T15:47:03+00:00" + "time": "2017-11-09T14:14:31+00:00" }, { "name": "symfony/finder", - "version": "v3.3.13", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880" + "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/138af5ec075d4b1d1bd19de08c38a34bb2d7d880", - "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880", + "url": "https://api.github.com/repos/symfony/finder/zipball/dac8d7db537bac7ad8143eb11360a8c2231f251a", + "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a", "shasum": "" }, "require": { @@ -4823,7 +4832,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -4850,20 +4859,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-11-05T15:47:03+00:00" + "time": "2017-11-05T16:10:10+00:00" }, { "name": "symfony/process", - "version": "v3.3.13", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d" + "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d", - "reference": "a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d", + "url": "https://api.github.com/repos/symfony/process/zipball/db25e810fd5e124085e3777257d0cf4ae533d0ea", + "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea", "shasum": "" }, "require": { @@ -4872,7 +4881,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -4899,27 +4908,30 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-11-13T15:31:11+00:00" + "time": "2017-11-22T12:18:49+00:00" }, { "name": "symfony/yaml", - "version": "v3.3.13", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "0938408c4faa518d95230deabb5f595bf0de31b9" + "reference": "f6a99b95b338799645fe9f7880d7d4ca1bf79cc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/0938408c4faa518d95230deabb5f595bf0de31b9", - "reference": "0938408c4faa518d95230deabb5f595bf0de31b9", + "url": "https://api.github.com/repos/symfony/yaml/zipball/f6a99b95b338799645fe9f7880d7d4ca1bf79cc1", + "reference": "f6a99b95b338799645fe9f7880d7d4ca1bf79cc1", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8" }, + "conflict": { + "symfony/console": "<3.4" + }, "require-dev": { - "symfony/console": "~2.8|~3.0" + "symfony/console": "~3.4|~4.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -4927,7 +4939,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -4954,7 +4966,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-11-10T18:26:04+00:00" + "time": "2017-12-04T18:15:22+00:00" }, { "name": "theseer/tokenizer", @@ -5190,6 +5202,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "silinternational/idp-pw-api-passwordstore-id-broker": 20, "adldap2/adldap2": 20, "roave/security-advisories": 20 }, From f9caefcf1377dc76b2b8d26c262bb399a7b80da4 Mon Sep 17 00:00:00 2001 From: Phillip Shipley Date: Wed, 6 Dec 2017 15:52:09 -0500 Subject: [PATCH 2/2] update passwordstore-multiple for password reuse fixes --- application/composer.json | 4 ++-- application/composer.lock | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/application/composer.json b/application/composer.json index 5c7eb1a8..b576f83d 100644 --- a/application/composer.json +++ b/application/composer.json @@ -25,8 +25,8 @@ "silinternational/idp-pw-api-personnel-multiple": "^1.0.0", "silinternational/idp-pw-api-auth-saml": "^1.0.1", "silinternational/idp-pw-api-passwordstore-ldap": "^2.1", - "silinternational/idp-pw-api-passwordstore-id-broker": "dev-develop", - "silinternational/idp-pw-api-passwordstore-multiple": "^1.0.1", + "silinternational/idp-pw-api-passwordstore-id-broker": "^3.2.1", + "silinternational/idp-pw-api-passwordstore-multiple": "^1.0.2", "silinternational/idp-pw-api-phoneverification-nexmo": "^2.0", "silinternational/zxcvbn-api-client-php": "^2.0", "google/recaptcha": "^1.1.2", diff --git a/application/composer.lock b/application/composer.lock index 3346faae..85bcb3df 100644 --- a/application/composer.lock +++ b/application/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "8f64af2de52e7df39b29a642446c319f", + "content-hash": "6f8e37e531ae0c9a29998c6772d288aa", "packages": [ { "name": "adldap2/adldap2", @@ -1679,16 +1679,16 @@ }, { "name": "silinternational/idp-pw-api-passwordstore-id-broker", - "version": "dev-develop", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/silinternational/idp-pw-api-passwordstore-id-broker.git", - "reference": "f9b74a7b59f4249aecdc9c1e4045d82da9802c55" + "reference": "bf83c52228c98b348b28a2da59761fbc8fd61594" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silinternational/idp-pw-api-passwordstore-id-broker/zipball/f9b74a7b59f4249aecdc9c1e4045d82da9802c55", - "reference": "f9b74a7b59f4249aecdc9c1e4045d82da9802c55", + "url": "https://api.github.com/repos/silinternational/idp-pw-api-passwordstore-id-broker/zipball/bf83c52228c98b348b28a2da59761fbc8fd61594", + "reference": "bf83c52228c98b348b28a2da59761fbc8fd61594", "shasum": "" }, "require": { @@ -1720,7 +1720,7 @@ } ], "description": "Id Broker Password Store component for IdP PW API", - "time": "2017-12-06T19:05:19+00:00" + "time": "2017-12-06T19:47:13+00:00" }, { "name": "silinternational/idp-pw-api-passwordstore-ldap", @@ -1765,16 +1765,16 @@ }, { "name": "silinternational/idp-pw-api-passwordstore-multiple", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/silinternational/idp-pw-api-passwordstore-multiple.git", - "reference": "9327d43d771cf8f0f2f740b25231c1887aab1ec5" + "reference": "e780df00ebeff2e5c2eb1b2fb027430aebf20148" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silinternational/idp-pw-api-passwordstore-multiple/zipball/9327d43d771cf8f0f2f740b25231c1887aab1ec5", - "reference": "9327d43d771cf8f0f2f740b25231c1887aab1ec5", + "url": "https://api.github.com/repos/silinternational/idp-pw-api-passwordstore-multiple/zipball/e780df00ebeff2e5c2eb1b2fb027430aebf20148", + "reference": "e780df00ebeff2e5c2eb1b2fb027430aebf20148", "shasum": "" }, "require": { @@ -1807,7 +1807,7 @@ } ], "description": "Password store component for IdP PW API for using multiple backends.", - "time": "2017-11-09T15:37:19+00:00" + "time": "2017-12-06T20:35:23+00:00" }, { "name": "silinternational/idp-pw-api-personnel-id-broker", @@ -5202,7 +5202,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "silinternational/idp-pw-api-passwordstore-id-broker": 20, "adldap2/adldap2": 20, "roave/security-advisories": 20 },