From 2225a930d606ea3b0bec848bea9a80842cad314e Mon Sep 17 00:00:00 2001 From: David Badura Date: Sat, 9 Jan 2021 11:04:22 +0100 Subject: [PATCH 1/2] allow php8 --- .github/workflows/phpunit.yml | 1 + composer.json | 10 +-- composer.lock | 143 ++++++++++++++++------------------ 3 files changed, 72 insertions(+), 82 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index eafed24f..93c31982 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -22,6 +22,7 @@ jobs: - "locked" php-version: - "7.4" + - "8.0" operating-system: - "ubuntu-latest" - "windows-latest" diff --git a/composer.json b/composer.json index 738af193..4b1b6609 100644 --- a/composer.json +++ b/composer.json @@ -18,20 +18,20 @@ } ], "require": { - "php": "^7.4", - "ext-json": "^7.4", + "php": "^7.4|^8.0", + "ext-json": "^7.4|^8.0", "doctrine/dbal": "^2.12.1|^3.0.0" }, "require-dev": { - "ext-pdo_sqlite": "^7.4", + "ext-pdo_sqlite": "^7.4|^8.0", "infection/infection": "^0.20.2", "patchlevel/coding-standard": "^1.0.0", "phpspec/prophecy-phpunit": "^2.0.1", "phpstan/phpstan": "^0.12.65", "phpunit/phpunit": "^9.5.0", - "symfony/messenger": "^5.2.1", + "symfony/messenger": "^4.4.18|^5.1.10", "symfony/var-dumper": "^5.2.1", - "vimeo/psalm": "^4.3.2" + "vimeo/psalm": "^4.3.2" }, "suggest": { "symfony/messenger": "for an advanced message bus" diff --git a/composer.lock b/composer.lock index 70a5c1fd..cf258a16 100644 --- a/composer.lock +++ b/composer.lock @@ -4,81 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "add58b3c96b52e2c579059f8618d3031", + "content-hash": "731030f52dd99f6adcb8832d050e3b11", "packages": [ - { - "name": "composer/package-versions-deprecated", - "version": "1.11.99.1", - "source": { - "type": "git", - "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/7413f0b55a051e89485c5cb9f765fe24bb02a7b6", - "reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.1.0 || ^2.0", - "php": "^7 || ^8" - }, - "replace": { - "ocramius/package-versions": "1.11.99" - }, - "require-dev": { - "composer/composer": "^1.9.3 || ^2.0@dev", - "ext-zip": "^1.13", - "phpunit/phpunit": "^6.5 || ^7" - }, - "type": "composer-plugin", - "extra": { - "class": "PackageVersions\\Installer", - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "PackageVersions\\": "src/PackageVersions" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "support": { - "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.1" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2020-11-11T10:22:58+00:00" - }, { "name": "doctrine/cache", "version": "1.10.2", @@ -383,6 +310,68 @@ } ], "time": "2020-05-29T18:28:51+00:00" + }, + { + "name": "ocramius/package-versions", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/Ocramius/PackageVersions.git", + "reference": "a7e35c34bc166a5684a1e2f13da7b1d6a821349d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/a7e35c34bc166a5684a1e2f13da7b1d6a821349d", + "reference": "a7e35c34bc166a5684a1e2f13da7b1d6a821349d", + "shasum": "" + }, + "require": { + "composer-runtime-api": "^2.0.0", + "php": "^7.4.7 || ~8.0.0" + }, + "replace": { + "composer/package-versions-deprecated": "*" + }, + "require-dev": { + "composer/composer": "^2.0.0@dev", + "doctrine/coding-standard": "^8.1.0", + "ext-zip": "^1.15.0", + "infection/infection": "dev-master#8d6c4d6b15ec58d3190a78b7774a5d604ec1075a", + "phpunit/phpunit": "~9.3.11", + "vimeo/psalm": "^4.0.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Provides efficient querying for installed package versions (no runtime IO)", + "support": { + "issues": "https://github.com/Ocramius/PackageVersions/issues", + "source": "https://github.com/Ocramius/PackageVersions/tree/2.1.0" + }, + "funding": [ + { + "url": "https://github.com/Ocramius", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/ocramius/package-versions", + "type": "tidelift" + } + ], + "time": "2020-10-21T13:48:04+00:00" } ], "packages-dev": [ @@ -5663,11 +5652,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.4", - "ext-json": "^7.4" + "php": "^7.4|^8.0", + "ext-json": "^7.4|^8.0" }, "platform-dev": { - "ext-pdo_sqlite": "^7.4" + "ext-pdo_sqlite": "^7.4|^8.0" }, "plugin-api-version": "2.0.0" } From 838fd74496cee7fab4b3ba33a48386bf272d8ba8 Mon Sep 17 00:00:00 2001 From: David Badura Date: Sat, 9 Jan 2021 11:05:38 +0100 Subject: [PATCH 2/2] fix cs --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4b1b6609..e58c072f 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "phpunit/phpunit": "^9.5.0", "symfony/messenger": "^4.4.18|^5.1.10", "symfony/var-dumper": "^5.2.1", - "vimeo/psalm": "^4.3.2" + "vimeo/psalm": "^4.3.2" }, "suggest": { "symfony/messenger": "for an advanced message bus"