From aca91cea3d97e79bed8226102912531fd853a8e3 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Wed, 3 Feb 2016 15:41:18 +0100
Subject: [PATCH] Update composer configuration.
---
composer.json | 11 ++-
composer.lock | 188 +++++++++++++++++++++++++++++++++++---------------
2 files changed, 139 insertions(+), 60 deletions(-)
diff --git a/composer.json b/composer.json
index ae06acd59..561957a13 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
{
"name": "simplesamlphp/simplesamlphp",
- "description": "A PHP implementation of SAML 2.0 service provider and identity provider functionality. And is also compatible with Shibboleth 1.3 and 2.0.",
+ "description": "A PHP implementation of a SAML 2.0 service provider and identity provider, also compatible with Shibboleth 1.3 and 2.0.",
"type": "project",
- "keywords": [ "saml2", "shibboleth","aselect","openid","oauth","ws-federation","sp","idp" ],
+ "keywords": [ "saml2", "shibboleth","oauth","ws-federation","sp","idp" ],
"homepage": "http://simplesamlphp.org",
"license": "LGPL-2.1",
"authors": [
@@ -13,6 +13,10 @@
{
"name": "Olav Morken",
"email": "olav.morken@uninett.no"
+ },
+ {
+ "name": "Jaime Perez",
+ "email": "jaime.perez@uninett.no"
}
],
"autoload": {
@@ -25,7 +29,8 @@
"php": ">=5.3",
"simplesamlphp/saml2": "~1.7",
"robrichards/xmlseclibs": "~1.4.1",
- "whitehat101/apr1-md5": "~1.0"
+ "whitehat101/apr1-md5": "~1.0",
+ "squizlabs/php_codesniffer": "^2.5.1"
},
"require-dev": {
"ext-pdo_sqlite": "*",
diff --git a/composer.lock b/composer.lock
index 899c3c0d0..ce251c734 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": "79273d493e7d184e2726c3e6b13c0d05",
- "content-hash": "675e663d2d81f0fb3ab32dbb80d2892d",
+ "hash": "d91235f43e589b4afc940dea2f53f6b6",
+ "content-hash": "2bb2aba1e49dd3229dd566235cb61f8b",
"packages": [
{
"name": "psr/log",
@@ -88,16 +88,16 @@
},
{
"name": "simplesamlphp/saml2",
- "version": "v1.7.1",
+ "version": "v1.8",
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/saml2.git",
- "reference": "4e360ddbefe04f1cf7a90eb417ca4a36c89a7ee2"
+ "reference": "11891064b8a2d1a483925cade7a9277f36b6055e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/4e360ddbefe04f1cf7a90eb417ca4a36c89a7ee2",
- "reference": "4e360ddbefe04f1cf7a90eb417ca4a36c89a7ee2",
+ "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/11891064b8a2d1a483925cade7a9277f36b6055e",
+ "reference": "11891064b8a2d1a483925cade7a9277f36b6055e",
"shasum": ""
},
"require": {
@@ -133,7 +133,84 @@
}
],
"description": "SAML2 PHP library from SimpleSAMLphp",
- "time": "2015-12-17 09:02:34"
+ "time": "2016-01-27 14:23:34"
+ },
+ {
+ "name": "squizlabs/php_codesniffer",
+ "version": "2.5.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+ "reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6731851d6aaf1d0d6c58feff1065227b7fda3ba8",
+ "reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8",
+ "shasum": ""
+ },
+ "require": {
+ "ext-tokenizer": "*",
+ "ext-xmlwriter": "*",
+ "php": ">=5.1.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.0"
+ },
+ "bin": [
+ "scripts/phpcs",
+ "scripts/phpcbf"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "CodeSniffer.php",
+ "CodeSniffer/CLI.php",
+ "CodeSniffer/Exception.php",
+ "CodeSniffer/File.php",
+ "CodeSniffer/Fixer.php",
+ "CodeSniffer/Report.php",
+ "CodeSniffer/Reporting.php",
+ "CodeSniffer/Sniff.php",
+ "CodeSniffer/Tokens.php",
+ "CodeSniffer/Reports/",
+ "CodeSniffer/Tokenizers/",
+ "CodeSniffer/DocGenerators/",
+ "CodeSniffer/Standards/AbstractPatternSniff.php",
+ "CodeSniffer/Standards/AbstractScopeSniff.php",
+ "CodeSniffer/Standards/AbstractVariableSniff.php",
+ "CodeSniffer/Standards/IncorrectPatternException.php",
+ "CodeSniffer/Standards/Generic/Sniffs/",
+ "CodeSniffer/Standards/MySource/Sniffs/",
+ "CodeSniffer/Standards/PEAR/Sniffs/",
+ "CodeSniffer/Standards/PSR1/Sniffs/",
+ "CodeSniffer/Standards/PSR2/Sniffs/",
+ "CodeSniffer/Standards/Squiz/Sniffs/",
+ "CodeSniffer/Standards/Zend/Sniffs/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Greg Sherwood",
+ "role": "lead"
+ }
+ ],
+ "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+ "homepage": "http://www.squizlabs.com/php-codesniffer",
+ "keywords": [
+ "phpcs",
+ "standards"
+ ],
+ "time": "2016-01-19 23:39:10"
},
{
"name": "whitehat101/apr1-md5",
@@ -640,16 +717,16 @@
},
{
"name": "satooshi/php-coveralls",
- "version": "v1.0.0",
+ "version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/satooshi/php-coveralls.git",
- "reference": "3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6"
+ "reference": "da51d304fe8622bf9a6da39a8446e7afd432115c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6",
- "reference": "3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6",
+ "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/da51d304fe8622bf9a6da39a8446e7afd432115c",
+ "reference": "da51d304fe8622bf9a6da39a8446e7afd432115c",
"shasum": ""
},
"require": {
@@ -658,10 +735,10 @@
"guzzle/guzzle": "^2.8|^3.0",
"php": ">=5.3.3",
"psr/log": "^1.0",
- "symfony/config": "^2.4|^3.0",
+ "symfony/config": "^2.1|^3.0",
"symfony/console": "^2.1|^3.0",
- "symfony/stopwatch": "^2.2|^3.0",
- "symfony/yaml": "^2.1|^3.0"
+ "symfony/stopwatch": "^2.0|^3.0",
+ "symfony/yaml": "^2.0|^3.0"
},
"suggest": {
"symfony/http-kernel": "Allows Symfony integration"
@@ -670,11 +747,6 @@
"bin/coveralls"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "0.8-dev"
- }
- },
"autoload": {
"psr-4": {
"Satooshi\\": "src/Satooshi/"
@@ -699,20 +771,20 @@
"github",
"test"
],
- "time": "2015-12-28 09:07:32"
+ "time": "2016-01-20 17:35:46"
},
{
"name": "symfony/config",
- "version": "v3.0.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "58680a6516a457a6c65044fe33586c4a81fdff01"
+ "reference": "8c83ff9a2ffbed1e606bc816db11ddc2385a16ee"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/58680a6516a457a6c65044fe33586c4a81fdff01",
- "reference": "58680a6516a457a6c65044fe33586c4a81fdff01",
+ "url": "https://api.github.com/repos/symfony/config/zipball/8c83ff9a2ffbed1e606bc816db11ddc2385a16ee",
+ "reference": "8c83ff9a2ffbed1e606bc816db11ddc2385a16ee",
"shasum": ""
},
"require": {
@@ -749,20 +821,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2015-12-26 13:39:53"
+ "time": "2016-01-21 09:38:31"
},
{
"name": "symfony/console",
- "version": "v3.0.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3"
+ "reference": "5a02eaadaa285e2bb727eb6bbdfb8201fcd971b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/ebcdc507829df915f4ca23067bd59ee4ef61f6c3",
- "reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3",
+ "url": "https://api.github.com/repos/symfony/console/zipball/5a02eaadaa285e2bb727eb6bbdfb8201fcd971b0",
+ "reference": "5a02eaadaa285e2bb727eb6bbdfb8201fcd971b0",
"shasum": ""
},
"require": {
@@ -809,20 +881,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2015-12-22 10:39:06"
+ "time": "2016-02-02 13:44:19"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.1",
+ "version": "v2.8.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc"
+ "reference": "ee278f7c851533e58ca307f66305ccb9188aceda"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc",
- "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ee278f7c851533e58ca307f66305ccb9188aceda",
+ "reference": "ee278f7c851533e58ca307f66305ccb9188aceda",
"shasum": ""
},
"require": {
@@ -869,20 +941,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2015-10-30 20:15:42"
+ "time": "2016-01-13 10:28:07"
},
{
"name": "symfony/filesystem",
- "version": "v3.0.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c"
+ "reference": "064ac12afd2ceb8a2c1bfb7bed8e931c6dd1997f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/c2e59d11dccd135dc8f00ee97f34fe1de842e70c",
- "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/064ac12afd2ceb8a2c1bfb7bed8e931c6dd1997f",
+ "reference": "064ac12afd2ceb8a2c1bfb7bed8e931c6dd1997f",
"shasum": ""
},
"require": {
@@ -918,20 +990,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2015-12-22 10:39:06"
+ "time": "2016-01-27 11:34:55"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.0.1",
+ "version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25"
+ "reference": "1289d16209491b584839022f29257ad859b8532d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25",
- "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
+ "reference": "1289d16209491b584839022f29257ad859b8532d",
"shasum": ""
},
"require": {
@@ -943,7 +1015,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.1-dev"
}
},
"autoload": {
@@ -977,20 +1049,20 @@
"portable",
"shim"
],
- "time": "2015-11-20 09:19:13"
+ "time": "2016-01-20 09:13:37"
},
{
"name": "symfony/stopwatch",
- "version": "v3.0.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800"
+ "reference": "4a204804952ff267ace88cf499e0b4bb302a475e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6aeac8907e3e1340a0033b0a9ec075f8e6524800",
- "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4a204804952ff267ace88cf499e0b4bb302a475e",
+ "reference": "4a204804952ff267ace88cf499e0b4bb302a475e",
"shasum": ""
},
"require": {
@@ -1026,20 +1098,20 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2015-10-30 23:35:59"
+ "time": "2016-01-03 15:35:16"
},
{
"name": "symfony/yaml",
- "version": "v2.8.1",
+ "version": "v2.8.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966"
+ "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966",
- "reference": "ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/34c8a4b51e751e7ea869b8262f883d008a2b81b8",
+ "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8",
"shasum": ""
},
"require": {
@@ -1075,7 +1147,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2015-12-26 13:37:56"
+ "time": "2016-01-13 10:28:07"
}
],
"aliases": [],
@@ -1086,5 +1158,7 @@
"platform": {
"php": ">=5.3"
},
- "platform-dev": []
+ "platform-dev": {
+ "ext-pdo_sqlite": "*"
+ }
}
--
GitLab