From b6f5bfdc757e2886ae7a07605145672f67f47c14 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Tue, 29 Dec 2015 08:48:19 +0000
Subject: [PATCH] Set php-coveralls dep to version 1.0 to fix build for PHP 5.3
and 5.4.
---
composer.json | 2 +-
composer.lock | 75 ++++++++++++++++++++++++++-------------------------
2 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/composer.json b/composer.json
index cc805567a..65d30d4e3 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
},
"require-dev": {
"phpunit/phpunit": "~3.7",
- "satooshi/php-coveralls": "dev-master"
+ "satooshi/php-coveralls": "^1.0"
},
"support": {
"issues": "https://github.com/simplesamlphp/simplesamlphp/issues",
diff --git a/composer.lock b/composer.lock
index 1d035ae22..899c3c0d0 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": "b4170f6ef1aa19cf7299c56a91332fff",
- "content-hash": "37c3a3afccac2b94a358d00516a2a3a8",
+ "hash": "79273d493e7d184e2726c3e6b13c0d05",
+ "content-hash": "675e663d2d81f0fb3ab32dbb80d2892d",
"packages": [
{
"name": "psr/log",
@@ -640,16 +640,16 @@
},
{
"name": "satooshi/php-coveralls",
- "version": "dev-master",
+ "version": "v1.0.0",
"source": {
"type": "git",
"url": "https://github.com/satooshi/php-coveralls.git",
- "reference": "f2fe833caef2c65620c11f5fabe60040df39339f"
+ "reference": "3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/f2fe833caef2c65620c11f5fabe60040df39339f",
- "reference": "f2fe833caef2c65620c11f5fabe60040df39339f",
+ "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6",
+ "reference": "3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6",
"shasum": ""
},
"require": {
@@ -699,20 +699,20 @@
"github",
"test"
],
- "time": "2015-12-17 20:16:23"
+ "time": "2015-12-28 09:07:32"
},
{
"name": "symfony/config",
- "version": "v3.0.0",
+ "version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "40bae8658dbbb500ebc19aa9fde22dc4295fc290"
+ "reference": "58680a6516a457a6c65044fe33586c4a81fdff01"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/40bae8658dbbb500ebc19aa9fde22dc4295fc290",
- "reference": "40bae8658dbbb500ebc19aa9fde22dc4295fc290",
+ "url": "https://api.github.com/repos/symfony/config/zipball/58680a6516a457a6c65044fe33586c4a81fdff01",
+ "reference": "58680a6516a457a6c65044fe33586c4a81fdff01",
"shasum": ""
},
"require": {
@@ -749,20 +749,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2015-11-02 20:34:04"
+ "time": "2015-12-26 13:39:53"
},
{
"name": "symfony/console",
- "version": "v3.0.0",
+ "version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "175871ca8d1ef16ff8d8cac395a1c73afa8d0e63"
+ "reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/175871ca8d1ef16ff8d8cac395a1c73afa8d0e63",
- "reference": "175871ca8d1ef16ff8d8cac395a1c73afa8d0e63",
+ "url": "https://api.github.com/repos/symfony/console/zipball/ebcdc507829df915f4ca23067bd59ee4ef61f6c3",
+ "reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3",
"shasum": ""
},
"require": {
@@ -809,11 +809,11 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2015-11-30 12:36:17"
+ "time": "2015-12-22 10:39:06"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.0",
+ "version": "v2.8.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -873,16 +873,16 @@
},
{
"name": "symfony/filesystem",
- "version": "v3.0.0",
+ "version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "692d98d813e4ef314b9c22775c86ddbeb0f44884"
+ "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/692d98d813e4ef314b9c22775c86ddbeb0f44884",
- "reference": "692d98d813e4ef314b9c22775c86ddbeb0f44884",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/c2e59d11dccd135dc8f00ee97f34fe1de842e70c",
+ "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c",
"shasum": ""
},
"require": {
@@ -918,25 +918,28 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2015-11-23 10:41:47"
+ "time": "2015-12-22 10:39:06"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.0.0",
+ "version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "0b6a8940385311a24e060ec1fe35680e17c74497"
+ "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497",
- "reference": "0b6a8940385311a24e060ec1fe35680e17c74497",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25",
+ "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
+ "suggest": {
+ "ext-mbstring": "For best performance"
+ },
"type": "library",
"extra": {
"branch-alias": {
@@ -974,11 +977,11 @@
"portable",
"shim"
],
- "time": "2015-11-04 20:28:58"
+ "time": "2015-11-20 09:19:13"
},
{
"name": "symfony/stopwatch",
- "version": "v3.0.0",
+ "version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
@@ -1027,16 +1030,16 @@
},
{
"name": "symfony/yaml",
- "version": "v2.8.0",
+ "version": "v2.8.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "f79824187de95064a2f5038904c4d7f0227fedb5"
+ "reference": "ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/f79824187de95064a2f5038904c4d7f0227fedb5",
- "reference": "f79824187de95064a2f5038904c4d7f0227fedb5",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966",
+ "reference": "ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966",
"shasum": ""
},
"require": {
@@ -1072,14 +1075,12 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2015-11-30 12:35:10"
+ "time": "2015-12-26 13:37:56"
}
],
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": {
- "satooshi/php-coveralls": 20
- },
+ "stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
--
GitLab