From a079337870713d95cb9a40885952faa6a8ab1b99 Mon Sep 17 00:00:00 2001 From: Aydin Hassan Date: Wed, 21 Oct 2020 22:33:04 +0100 Subject: [PATCH 1/2] Use composer dev-master for php8 support --- composer.json | 2 +- composer.lock | 112 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 83 insertions(+), 31 deletions(-) diff --git a/composer.json b/composer.json index b349cca9..f5df3fa8 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "guzzlehttp/guzzle": "^7.2" }, "require-dev": { - "composer/composer": "^1.2", + "composer/composer": "dev-master", "squizlabs/php_codesniffer": "^3.4", "symfony/phpunit-bridge": "^5.1", "phpstan/phpstan": "^0.12.50", diff --git a/composer.lock b/composer.lock index 9099b323..dff5035d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "54cf397f1643ba1107f77f288e3586a3", + "content-hash": "a86bde0ed96422423aa7c6c4c59ac60a", "packages": [ { "name": "aydin-hassan/cli-md-renderer", @@ -1580,52 +1580,51 @@ }, { "name": "composer/composer", - "version": "1.10.16", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "217f0272673c72087862c40cf91ac07eb438d778" + "reference": "37cb6eb40dd3ed1f5981208c81171b15ac0b164d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/217f0272673c72087862c40cf91ac07eb438d778", - "reference": "217f0272673c72087862c40cf91ac07eb438d778", + "url": "https://api.github.com/repos/composer/composer/zipball/37cb6eb40dd3ed1f5981208c81171b15ac0b164d", + "reference": "37cb6eb40dd3ed1f5981208c81171b15ac0b164d", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", - "composer/semver": "^1.0", + "composer/semver": "^3.0", "composer/spdx-licenses": "^1.2", "composer/xdebug-handler": "^1.1", "justinrainbow/json-schema": "^5.2.10", - "php": "^5.3.2 || ^7.0", + "php": "^5.3.2 || ^7.0 || ^8.0", "psr/log": "^1.0", + "react/promise": "^1.2 || ^2.7", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.0", - "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0", - "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0", - "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0", - "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0" - }, - "conflict": { - "symfony/console": "2.8.38" + "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", + "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", + "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", + "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0" }, "require-dev": { "phpspec/prophecy": "^1.10", - "symfony/phpunit-bridge": "^4.2" + "symfony/phpunit-bridge": "^4.2 || ^5.0" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", "ext-zip": "Enabling the zip extension allows you to unzip archives", "ext-zlib": "Allow gzip compression of HTTP requests" }, + "default-branch": true, "bin": [ "bin/composer" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.10-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1641,12 +1640,12 @@ { "name": "Nils Adermann", "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" + "homepage": "https://www.naderman.de" }, { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.", @@ -1659,7 +1658,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/1.10.16" + "source": "https://github.com/composer/composer/tree/master" }, "funding": [ { @@ -1675,32 +1674,33 @@ "type": "tidelift" } ], - "time": "2020-10-24T07:55:59+00:00" + "time": "2020-10-24T18:54:37+00:00" }, { "name": "composer/semver", - "version": "1.7.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "38276325bd896f90dfcfe30029aa5db40df387a7" + "reference": "4089fddb67bcf6bf860d91b979e95be303835002" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/38276325bd896f90dfcfe30029aa5db40df387a7", - "reference": "38276325bd896f90dfcfe30029aa5db40df387a7", + "url": "https://api.github.com/repos/composer/semver/zipball/4089fddb67bcf6bf860d91b979e95be303835002", + "reference": "4089fddb67bcf6bf860d91b979e95be303835002", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.5 || ^5.0.5" + "phpstan/phpstan": "^0.12.19", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -1739,7 +1739,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/1.7.1" + "source": "https://github.com/composer/semver/tree/3.2.2" }, "funding": [ { @@ -1755,7 +1755,7 @@ "type": "tidelift" } ], - "time": "2020-09-27T13:13:07+00:00" + "time": "2020-10-14T08:51:15+00:00" }, { "name": "composer/spdx-licenses", @@ -2202,6 +2202,56 @@ }, "time": "2020-03-23T09:12:05+00:00" }, + { + "name": "react/promise", + "version": "v2.8.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/promise.git", + "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4", + "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com" + } + ], + "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "keywords": [ + "promise", + "promises" + ], + "support": { + "issues": "https://github.com/reactphp/promise/issues", + "source": "https://github.com/reactphp/promise/tree/v2.8.0" + }, + "time": "2020-05-12T15:16:56+00:00" + }, { "name": "seld/jsonlint", "version": "1.8.2", @@ -3193,7 +3243,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "composer/composer": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { From 9060e83e7065d24c19f6040bdec2c147c1020fcb Mon Sep 17 00:00:00 2001 From: Aydin Hassan Date: Sat, 24 Oct 2020 11:14:07 +0100 Subject: [PATCH 2/2] Update to composer 2 --- composer.json | 2 +- composer.lock | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index f5df3fa8..590a3c7b 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "guzzlehttp/guzzle": "^7.2" }, "require-dev": { - "composer/composer": "dev-master", + "composer/composer": "^2.0", "squizlabs/php_codesniffer": "^3.4", "symfony/phpunit-bridge": "^5.1", "phpstan/phpstan": "^0.12.50", diff --git a/composer.lock b/composer.lock index dff5035d..be1535ff 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a86bde0ed96422423aa7c6c4c59ac60a", + "content-hash": "6bd14f47973f74451108731c27485955", "packages": [ { "name": "aydin-hassan/cli-md-renderer", @@ -1580,16 +1580,16 @@ }, { "name": "composer/composer", - "version": "dev-master", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "37cb6eb40dd3ed1f5981208c81171b15ac0b164d" + "reference": "66f4e5d49ff52eecb603e7e5b5bb8645204d0658" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/37cb6eb40dd3ed1f5981208c81171b15ac0b164d", - "reference": "37cb6eb40dd3ed1f5981208c81171b15ac0b164d", + "url": "https://api.github.com/repos/composer/composer/zipball/66f4e5d49ff52eecb603e7e5b5bb8645204d0658", + "reference": "66f4e5d49ff52eecb603e7e5b5bb8645204d0658", "shasum": "" }, "require": { @@ -1617,7 +1617,6 @@ "ext-zip": "Enabling the zip extension allows you to unzip archives", "ext-zlib": "Allow gzip compression of HTTP requests" }, - "default-branch": true, "bin": [ "bin/composer" ], @@ -1658,7 +1657,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/master" + "source": "https://github.com/composer/composer/tree/2.0.1" }, "funding": [ { @@ -1674,7 +1673,7 @@ "type": "tidelift" } ], - "time": "2020-10-24T18:54:37+00:00" + "time": "2020-10-24T18:53:21+00:00" }, { "name": "composer/semver", @@ -3243,9 +3242,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "composer/composer": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": {