From 5ae8912403dcb1ca8f8bcb99984f4e0fe1815c03 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 27 Aug 2018 18:18:22 +0200 Subject: [PATCH] Fix PHP Coveralls deps --- .travis.yml | 2 +- composer.json | 2 +- composer.lock | 121 +++++++++++++++++++++++++------------------------- 3 files changed, 62 insertions(+), 63 deletions(-) diff --git a/.travis.yml b/.travis.yml index c561427b..7b98db05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,5 +47,5 @@ script: after_success: - | if [ "$COVERAGE" = "run" ]; then - php bin/coveralls -v + php bin/php-coveralls -v fi diff --git a/composer.json b/composer.json index 1d909dd4..8f1219f6 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "sensio/generator-bundle": "^3.0", "symfony/phpunit-bridge": "^3.0", "doctrine/doctrine-fixtures-bundle": "^2.3", - "satooshi/php-coveralls": "dev-master", + "php-coveralls/php-coveralls": "^2.0", "m6web/redis-mock": "dev-predis-1.x" }, "scripts": { diff --git a/composer.lock b/composer.lock index f1b025b8..a46b0ea9 100644 --- a/composer.lock +++ b/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": "da82c2ab8ceab58d59e0df173814e2b8", + "content-hash": "b443d089f9646e0f8e71cffca044a95d", "packages": [ { "name": "ashleydawson/simple-pagination", @@ -4955,68 +4955,17 @@ "time": "2017-03-03T14:29:12+00:00" }, { - "name": "php-cs-fixer/diff", - "version": "v1.3.0", - "source": { - "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756", - "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3", - "symfony/process": "^3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "SpacePossum" - } - ], - "description": "sebastian/diff v2 backport support for PHP5.6", - "homepage": "https://github.com/PHP-CS-Fixer", - "keywords": [ - "diff" - ], - "time": "2018-02-15T16:58:55+00:00" - }, - { - "name": "satooshi/php-coveralls", - "version": "dev-master", + "name": "php-coveralls/php-coveralls", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/php-coveralls/php-coveralls.git", - "reference": "a9c356100c095e07b004d32942c9ff5731459b49" + "reference": "3b00c229726f892bfdadeaf01ea430ffd04a939d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/a9c356100c095e07b004d32942c9ff5731459b49", - "reference": "a9c356100c095e07b004d32942c9ff5731459b49", + "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/3b00c229726f892bfdadeaf01ea430ffd04a939d", + "reference": "3b00c229726f892bfdadeaf01ea430ffd04a939d", "shasum": "" }, "require": { @@ -5037,12 +4986,12 @@ "symfony/http-kernel": "Allows Symfony integration" }, "bin": [ - "bin/coveralls" + "bin/php-coveralls" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -5086,7 +5035,58 @@ "github", "test" ], - "time": "2017-12-08T13:59:48+00:00" + "time": "2018-05-22T23:11:08+00:00" + }, + { + "name": "php-cs-fixer/diff", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756", + "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "symfony/process": "^3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "SpacePossum" + } + ], + "description": "sebastian/diff v2 backport support for PHP5.6", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "time": "2018-02-15T16:58:55+00:00" }, { "name": "sensio/generator-bundle", @@ -5267,7 +5267,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "satooshi/php-coveralls": 20, "m6web/redis-mock": 20 }, "prefer-stable": false,