From d3a1b9779efcb8d2a89107e49396fee47f6fdcc5 Mon Sep 17 00:00:00 2001 From: DRvanR Date: Wed, 3 Aug 2016 10:18:22 +0200 Subject: [PATCH 1/4] Using updated stepup-bundle for improved log correlation --- composer.json | 4 +- composer.lock | 223 +++++++++++++++++++++++++++----------------------- 2 files changed, 124 insertions(+), 103 deletions(-) diff --git a/composer.json b/composer.json index 2cb8baac6..0aab53b86 100644 --- a/composer.json +++ b/composer.json @@ -23,10 +23,10 @@ "fortawesome/font-awesome": "~4.2.0", "jms/translation-bundle": "~1.1.0", "jms/di-extra-bundle": "~1.4.0", - "surfnet/stepup-middleware-client-bundle": "~1.1", + "surfnet/stepup-middleware-client-bundle": "dev-develop", "guzzlehttp/guzzle": "~4", "surfnet/stepup-saml-bundle": "~2.4", - "surfnet/stepup-bundle": "^1.3.0", + "surfnet/stepup-bundle": "^1.5", "symfony/swiftmailer-bundle": "~2.3", "surfnet/stepup-u2f-bundle": "dev-develop", "mopa/composer-bridge": "~1.5" diff --git a/composer.lock b/composer.lock index 9f7923d55..82cef1ef3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a36eee2500381a96db9b43127bfea593", - "content-hash": "c4e2d5d2ebd09a1c23f4269664bdd389", + "hash": "edcf77c44a23c94256a93e010bb6297b", + "content-hash": "14c642f348e03454ebfc4cba844f08e9", "packages": [ { "name": "beberlei/assert", - "version": "v2.5", + "version": "v2.6.3", "source": { "type": "git", "url": "https://github.com/beberlei/assert.git", - "reference": "91e2690c4ecc8a4e3e2d333430069f6a0c694a7a" + "reference": "51e9d654481fc00c8a376641c390ec4e35d8c1fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beberlei/assert/zipball/91e2690c4ecc8a4e3e2d333430069f6a0c694a7a", - "reference": "91e2690c4ecc8a4e3e2d333430069f6a0c694a7a", + "url": "https://api.github.com/repos/beberlei/assert/zipball/51e9d654481fc00c8a376641c390ec4e35d8c1fc", + "reference": "51e9d654481fc00c8a376641c390ec4e35d8c1fc", "shasum": "" }, "require": { @@ -31,7 +31,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.5-dev" } }, "autoload": { @@ -49,7 +49,13 @@ "authors": [ { "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" + "email": "kontakt@beberlei.de", + "role": "Lead Developer" + }, + { + "name": "Richard Quadling", + "email": "rquadling@gmail.com", + "role": "Collaborator" } ], "description": "Thin assertion library for input validation in business models.", @@ -58,7 +64,7 @@ "assertion", "validation" ], - "time": "2016-03-22 14:34:51" + "time": "2016-07-28 19:35:30" }, { "name": "doctrine/annotations", @@ -561,16 +567,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "4.2.3", + "version": "4.2.4", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "66fd916e9f9130bc22c51450476823391cb2f67c" + "reference": "13a8e5acff26b0a87d353042170b48976da004a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/66fd916e9f9130bc22c51450476823391cb2f67c", - "reference": "66fd916e9f9130bc22c51450476823391cb2f67c", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/13a8e5acff26b0a87d353042170b48976da004a1", + "reference": "13a8e5acff26b0a87d353042170b48976da004a1", "shasum": "" }, "require": { @@ -622,7 +628,7 @@ "rest", "web service" ], - "time": "2014-10-05 19:29:14" + "time": "2016-07-15 17:44:18" }, { "name": "guzzlehttp/streams", @@ -1091,16 +1097,16 @@ }, { "name": "monolog/monolog", - "version": "1.19.0", + "version": "1.21.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf" + "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5f56ed5212dc509c8dc8caeba2715732abb32dbf", - "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952", + "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952", "shasum": "" }, "require": { @@ -1119,8 +1125,8 @@ "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "^0.13", "ruflin/elastica": ">=0.90 <3.0", + "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "~5.3" }, "suggest": { @@ -1132,9 +1138,9 @@ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", - "raven/raven": "Allow sending log messages to a Sentry server", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server", + "sentry/sentry": "Allow sending log messages to a Sentry server" }, "type": "library", "extra": { @@ -1165,7 +1171,7 @@ "logging", "psr-3" ], - "time": "2016-04-12 18:29:35" + "time": "2016-07-29 03:23:52" }, { "name": "moontoast/math", @@ -1501,46 +1507,55 @@ "time": "2012-12-21 11:40:51" }, { - "name": "rhumsaa/uuid", - "version": "2.8.2", + "name": "ramsey/uuid", + "version": "3.5.0", "source": { "type": "git", - "url": "https://github.com/ramsey/rhumsaa-uuid.git", - "reference": "9c1e2d34bdefd42608c612e08d6e1da1e13a3530" + "url": "https://github.com/ramsey/uuid.git", + "reference": "a6d15c8618ea3951fd54d34e326b68d3d0bc0786" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/rhumsaa-uuid/zipball/9c1e2d34bdefd42608c612e08d6e1da1e13a3530", - "reference": "9c1e2d34bdefd42608c612e08d6e1da1e13a3530", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/a6d15c8618ea3951fd54d34e326b68d3d0bc0786", + "reference": "a6d15c8618ea3951fd54d34e326b68d3d0bc0786", "shasum": "" }, "require": { - "php": ">=5.3.3" + "paragonie/random_compat": "^1.0|^2.0", + "php": ">=5.4" }, "replace": { "rhumsaa/uuid": "self.version" }, "require-dev": { - "doctrine/dbal": ">=2.3", + "apigen/apigen": "^4.1", + "codeception/aspect-mock": "1.0.0", + "goaop/framework": "1.0.0-alpha.2", + "ircmaxell/random-lib": "^1.1", "jakub-onderka/php-parallel-lint": "^0.9.0", - "moontoast/math": "~1.1", - "phpunit/phpunit": "~4.1", - "satooshi/php-coveralls": "~0.6", - "squizlabs/php_codesniffer": "^2.3", - "symfony/console": "~2.3" + "mockery/mockery": "^0.9.4", + "moontoast/math": "^1.1", + "phpunit/phpunit": "^4.7|>=5.0 <5.4", + "satooshi/php-coveralls": "^0.6.1", + "squizlabs/php_codesniffer": "^2.3" }, "suggest": { - "doctrine/dbal": "Allow the use of a UUID as doctrine field type.", - "moontoast/math": "Support for converting UUID to 128-bit integer (in string form).", - "symfony/console": "Support for use of the bin/uuid command line tool." + "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator", + "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", + "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter", + "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).", + "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid", + "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." }, - "bin": [ - "bin/uuid" - ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, "autoload": { "psr-4": { - "Rhumsaa\\Uuid\\": "src/" + "Ramsey\\Uuid\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1552,20 +1567,24 @@ "name": "Marijn Huizendveld", "email": "marijn.huizendveld@gmail.com" }, + { + "name": "Thibaud Fabre", + "email": "thibaud@aztech.io" + }, { "name": "Ben Ramsey", - "homepage": "http://benramsey.com" + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" } ], - "description": "NO LONGER MAINTAINED. Use ramsey/uuid instead. A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", - "homepage": "https://github.com/ramsey/rhumsaa-uuid", + "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", + "homepage": "https://github.com/ramsey/uuid", "keywords": [ "guid", "identifier", "uuid" ], - "abandoned": "ramsey/uuid", - "time": "2015-07-23 19:00:41" + "time": "2016-08-02 18:39:32" }, { "name": "robrichards/xmlseclibs", @@ -1826,25 +1845,25 @@ }, { "name": "surfnet/stepup-bundle", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/SURFnet/Stepup-bundle.git", - "reference": "0d29ea86a1fe6523fc5697796e59af28c9580fe3" + "reference": "4ad7ebe9f9075ec39c5d1fc8449fe8fef33e60d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SURFnet/Stepup-bundle/zipball/0d29ea86a1fe6523fc5697796e59af28c9580fe3", - "reference": "0d29ea86a1fe6523fc5697796e59af28c9580fe3", + "url": "https://api.github.com/repos/SURFnet/Stepup-bundle/zipball/4ad7ebe9f9075ec39c5d1fc8449fe8fef33e60d2", + "reference": "4ad7ebe9f9075ec39c5d1fc8449fe8fef33e60d2", "shasum": "" }, "require": { "ext-gmp": "*", "ext-openssl": "*", - "graylog2/gelf-php": "~1.1", + "graylog2/gelf-php": "^1.5", "guzzlehttp/guzzle": "~4", "monolog/monolog": "~1.11", - "php": ">=5.4,<8.0-dev", + "php": "^5.6|^7.0", "sensio/framework-extra-bundle": "~3", "symfony/config": "^2.7", "symfony/dependency-injection": "^2.7", @@ -1875,29 +1894,29 @@ "suaas", "surfnet" ], - "time": "2016-06-08 13:02:43" + "time": "2016-08-03 07:45:32" }, { "name": "surfnet/stepup-middleware-client-bundle", - "version": "1.1.0", + "version": "dev-develop", "source": { "type": "git", "url": "https://github.com/SURFnet/Stepup-Middleware-clientbundle.git", - "reference": "ed3593f4ff880282db977360591470a15a3c2cec" + "reference": "620f0b20135ce1a080e4316667bc2841b3a3ce9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SURFnet/Stepup-Middleware-clientbundle/zipball/ed3593f4ff880282db977360591470a15a3c2cec", - "reference": "ed3593f4ff880282db977360591470a15a3c2cec", + "url": "https://api.github.com/repos/SURFnet/Stepup-Middleware-clientbundle/zipball/620f0b20135ce1a080e4316667bc2841b3a3ce9b", + "reference": "620f0b20135ce1a080e4316667bc2841b3a3ce9b", "shasum": "" }, "require": { "beberlei/assert": "~2.0", "guzzlehttp/guzzle": "~4", "moontoast/math": "~1.1", - "php": ">=5.4,<8.0-dev", + "php": "^5.6|^7.0", "psr/log": "~1.0", - "rhumsaa/uuid": "~2.7", + "ramsey/uuid": "^3.4", "symfony/config": "^2.7", "symfony/dependency-injection": "^2.7", "symfony/http-kernel": "^2.7", @@ -1924,20 +1943,20 @@ "Apache-2.0" ], "description": "Symfony2 bundle for consuming the Step-up Middleware API.", - "time": "2016-06-09 08:15:30" + "time": "2016-08-02 09:40:37" }, { "name": "surfnet/stepup-saml-bundle", - "version": "2.4.0", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/SURFnet/Stepup-saml-bundle.git", - "reference": "9e201f4514f6be6073c98c4303a7299ccb11c94b" + "reference": "3ee050d16f76bf63b48fa01af3e75e1b42668d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SURFnet/Stepup-saml-bundle/zipball/9e201f4514f6be6073c98c4303a7299ccb11c94b", - "reference": "9e201f4514f6be6073c98c4303a7299ccb11c94b", + "url": "https://api.github.com/repos/SURFnet/Stepup-saml-bundle/zipball/3ee050d16f76bf63b48fa01af3e75e1b42668d72", + "reference": "3ee050d16f76bf63b48fa01af3e75e1b42668d72", "shasum": "" }, "require": { @@ -1972,7 +1991,7 @@ "stepup", "surfnet" ], - "time": "2016-05-31 11:01:39" + "time": "2016-07-01 09:33:44" }, { "name": "surfnet/stepup-u2f-bundle", @@ -2018,23 +2037,23 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.2", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "d8db871a54619458a805229a057ea2af33c753e8" + "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d8db871a54619458a805229a057ea2af33c753e8", - "reference": "d8db871a54619458a805229a057ea2af33c753e8", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", + "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "~0.9.1,<0.9.4" + "mockery/mockery": "~0.9.1" }, "type": "library", "extra": { @@ -2067,7 +2086,7 @@ "mail", "mailer" ], - "time": "2016-05-01 08:45:47" + "time": "2016-07-08 11:51:25" }, { "name": "symfony/assetic-bundle", @@ -2370,16 +2389,16 @@ }, { "name": "symfony/symfony", - "version": "v2.7.14", + "version": "v2.7.16", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "fe443f4a8b6b2f3977d4fe6b348e9f85a7840ea1" + "reference": "42199fef6e9b448947d395add058642975e59127" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/fe443f4a8b6b2f3977d4fe6b348e9f85a7840ea1", - "reference": "fe443f4a8b6b2f3977d4fe6b348e9f85a7840ea1", + "url": "https://api.github.com/repos/symfony/symfony/zipball/42199fef6e9b448947d395add058642975e59127", + "reference": "42199fef6e9b448947d395add058642975e59127", "shasum": "" }, "require": { @@ -2442,7 +2461,7 @@ "doctrine/dbal": "~2.4", "doctrine/doctrine-bundle": "~1.2", "doctrine/orm": "~2.4,>=2.4.5", - "egulias/email-validator": "~1.2", + "egulias/email-validator": "~1.2,>=1.2.1", "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0|~2.0" @@ -2493,7 +2512,7 @@ "keywords": [ "framework" ], - "time": "2016-06-06 15:23:39" + "time": "2016-07-30 08:15:52" }, { "name": "twbs/bootstrap", @@ -3658,22 +3677,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61" + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/45ada3e3fd09789fbfbd6d65b3f0901f0030dc61", - "reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", "shasum": "" }, "require": { "php": ">=5.5", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.1.5", + "phpdocumentor/type-resolver": "^0.2.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -3699,20 +3718,20 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-06-06 06:44:13" + "time": "2016-06-10 09:48:41" }, { "name": "phpdocumentor/type-resolver", - "version": "0.1.8", + "version": "0.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "9891754231e55d42f0d16988ffb799af39f31a12" + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9891754231e55d42f0d16988ffb799af39f31a12", - "reference": "9891754231e55d42f0d16988ffb799af39f31a12", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443", + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443", "shasum": "" }, "require": { @@ -3721,7 +3740,7 @@ }, "require-dev": { "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2" + "phpunit/phpunit": "^5.2||^4.8.24" }, "type": "library", "extra": { @@ -3746,7 +3765,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-03-28 10:02:29" + "time": "2016-06-10 07:14:17" }, { "name": "phpmd/phpmd", @@ -4120,16 +4139,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.26", + "version": "4.8.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74" + "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74", - "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90", + "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90", "shasum": "" }, "require": { @@ -4188,7 +4207,7 @@ "testing", "xunit" ], - "time": "2016-05-17 03:09:28" + "time": "2016-07-21 06:48:14" }, { "name": "phpunit/phpunit-mock-objects", @@ -4414,16 +4433,16 @@ }, { "name": "sebastian/exporter", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e" + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", "shasum": "" }, "require": { @@ -4431,12 +4450,13 @@ "sebastian/recursion-context": "~1.0" }, "require-dev": { + "ext-mbstring": "*", "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -4476,7 +4496,7 @@ "export", "exporter" ], - "time": "2015-06-21 07:55:53" + "time": "2016-06-17 09:04:28" }, { "name": "sebastian/finder-facade", @@ -4983,6 +5003,7 @@ "minimum-stability": "stable", "stability-flags": { "mopa/bootstrap-bundle": 20, + "surfnet/stepup-middleware-client-bundle": 20, "surfnet/stepup-u2f-bundle": 20 }, "prefer-stable": false, From f30f6632aaf152d9eec3958eec69cf2190019d85 Mon Sep 17 00:00:00 2001 From: DRvanR Date: Wed, 3 Aug 2016 11:09:32 +0200 Subject: [PATCH 2/4] Using stable version of middleware client --- composer.json | 2 +- composer.lock | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 0aab53b86..9df48bbb5 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "fortawesome/font-awesome": "~4.2.0", "jms/translation-bundle": "~1.1.0", "jms/di-extra-bundle": "~1.4.0", - "surfnet/stepup-middleware-client-bundle": "dev-develop", + "surfnet/stepup-middleware-client-bundle": "^1.3", "guzzlehttp/guzzle": "~4", "surfnet/stepup-saml-bundle": "~2.4", "surfnet/stepup-bundle": "^1.5", diff --git a/composer.lock b/composer.lock index 82cef1ef3..f1b76dd5c 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": "edcf77c44a23c94256a93e010bb6297b", - "content-hash": "14c642f348e03454ebfc4cba844f08e9", + "hash": "2896c17eaf43c91ecafc86a14d76c030", + "content-hash": "e2210f8630c3c3023347d2fa6648add1", "packages": [ { "name": "beberlei/assert", @@ -1898,16 +1898,16 @@ }, { "name": "surfnet/stepup-middleware-client-bundle", - "version": "dev-develop", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/SURFnet/Stepup-Middleware-clientbundle.git", - "reference": "620f0b20135ce1a080e4316667bc2841b3a3ce9b" + "reference": "ee1dbf1664ca959500609793ec8c185a367cb9ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SURFnet/Stepup-Middleware-clientbundle/zipball/620f0b20135ce1a080e4316667bc2841b3a3ce9b", - "reference": "620f0b20135ce1a080e4316667bc2841b3a3ce9b", + "url": "https://api.github.com/repos/SURFnet/Stepup-Middleware-clientbundle/zipball/ee1dbf1664ca959500609793ec8c185a367cb9ca", + "reference": "ee1dbf1664ca959500609793ec8c185a367cb9ca", "shasum": "" }, "require": { @@ -1943,7 +1943,7 @@ "Apache-2.0" ], "description": "Symfony2 bundle for consuming the Step-up Middleware API.", - "time": "2016-08-02 09:40:37" + "time": "2016-08-03 08:56:12" }, { "name": "surfnet/stepup-saml-bundle", @@ -5003,7 +5003,6 @@ "minimum-stability": "stable", "stability-flags": { "mopa/bootstrap-bundle": 20, - "surfnet/stepup-middleware-client-bundle": 20, "surfnet/stepup-u2f-bundle": 20 }, "prefer-stable": false, From 0b238d5679000a95cf8edab20d66ec2922a96287 Mon Sep 17 00:00:00 2001 From: DRvanR Date: Wed, 3 Aug 2016 11:21:56 +0200 Subject: [PATCH 3/4] Using updated saml bundle with fixed CI requirements --- app/config/parameters.yml.dist | 2 +- composer.json | 2 +- composer.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 2ce8a9e64..10d66f42b 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -36,7 +36,7 @@ parameters: saml_remote_idp_entity_id: saml_remote_idp_sso_url: - saml_remote_idp_certificate: + saml_remote_idp_certificate: 'FOR CI ONLY, REPLACE WITH ACTUAL VALUE' graylog_hostname: g2-dev.stepup.coin.surf.net asset_version: 1 diff --git a/composer.json b/composer.json index 9df48bbb5..bba43d846 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "jms/di-extra-bundle": "~1.4.0", "surfnet/stepup-middleware-client-bundle": "^1.3", "guzzlehttp/guzzle": "~4", - "surfnet/stepup-saml-bundle": "~2.4", + "surfnet/stepup-saml-bundle": "^2.5", "surfnet/stepup-bundle": "^1.5", "symfony/swiftmailer-bundle": "~2.3", "surfnet/stepup-u2f-bundle": "dev-develop", diff --git a/composer.lock b/composer.lock index f1b76dd5c..359771eae 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": "2896c17eaf43c91ecafc86a14d76c030", - "content-hash": "e2210f8630c3c3023347d2fa6648add1", + "hash": "2d457a0d9a20d4dbafdf8cd54a104468", + "content-hash": "c17572b3726a78c659fa18ed57cfd718", "packages": [ { "name": "beberlei/assert", From 3e4e2eefb39d37b0b27d0178bd409828e43dc09f Mon Sep 17 00:00:00 2001 From: DRvanR Date: Wed, 3 Aug 2016 11:29:38 +0200 Subject: [PATCH 4/4] Actively supported php versions are reflected in documentation --- .travis.yml | 4 ---- README.md | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04760e6a2..a6a260df2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,6 @@ php: - 5.6 - 7.0 -matrix: - allow_failures: - - php: 7.0 - env: global: - SYMFONY_ENV=test diff --git a/README.md b/README.md index 221d7e44c..f13b900ed 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Step-up Self-Service ## Requirements - * PHP 5.6 (Note that we test on 7.0 but do not run or support it officially) + * PHP 5.6+ or PHP7 * [Composer](https://getcomposer.org/) * A web server (Apache, Nginx) * Graylog2 (or disable this Monolog handler)