From dee50e5f7b5496130b95144af4bcef408ffc4144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 28 Nov 2022 18:08:27 +0100 Subject: [PATCH] Fix: Drop support for PHP 7.4 --- .github/settings.yml | 11 +++--- .github/workflows/integrate.yaml | 9 +++-- .github/workflows/renew.yaml | 2 +- CHANGELOG.md | 5 +++ composer.json | 4 +-- composer.lock | 61 +++++++++++++++++++++----------- 6 files changed, 57 insertions(+), 35 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index c83e434..67f8345 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -14,13 +14,10 @@ branches: required_approving_review_count: 1 required_status_checks: contexts: - - "Code Coverage (7.4, locked)" - - "Coding Standards (7.4, locked)" - - "Dependency Analysis (7.4, locked)" - - "Static Code Analysis (7.4, locked)" - - "Tests (7.4, highest)" - - "Tests (7.4, locked)" - - "Tests (7.4, lowest)" + - "Code Coverage (8.0, locked)" + - "Coding Standards (8.0, locked)" + - "Dependency Analysis (8.0, locked)" + - "Static Code Analysis (8.0, locked)" - "Tests (8.0, highest)" - "Tests (8.0, locked)" - "Tests (8.0, lowest)" diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 52e14da..3546e0c 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -17,7 +17,7 @@ jobs: strategy: matrix: php-version: - - "7.4" + - "8.0" dependencies: - "locked" @@ -72,7 +72,7 @@ jobs: strategy: matrix: php-version: - - "7.4" + - "8.0" dependencies: - "locked" @@ -140,7 +140,7 @@ jobs: strategy: matrix: php-version: - - "7.4" + - "8.0" dependencies: - "locked" @@ -185,7 +185,7 @@ jobs: strategy: matrix: php-version: - - "7.4" + - "8.0" dependencies: - "locked" @@ -233,7 +233,6 @@ jobs: strategy: matrix: php-version: - - "7.4" - "8.0" - "8.1" diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index 2e720d8..3062cd9 100644 --- a/.github/workflows/renew.yaml +++ b/.github/workflows/renew.yaml @@ -15,7 +15,7 @@ jobs: strategy: matrix: php-version: - - "7.4" + - "8.0" dependencies: - "locked" diff --git a/CHANGELOG.md b/CHANGELOG.md index a2476a0..5ffc49b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`1.2.0...main`][1.2.0...main]. +### Changed + +- Dropped support for PHP 7.4 ([#119]), by [@localheinz] + ## [`1.2.0`][1.2.0] For a full diff see [`1.1.0...1.2.0`][1.1.0...1.2.0]. @@ -45,5 +49,6 @@ For a full diff see [`a5f2657...1.0.0`][a5f2657...1.0.0]. [#1]: https://github.com/ergebnis/data-provider/pull/1 [#21]: https://github.com/ergebnis/data-provider/pull/21 [#40]: https://github.com/ergebnis/data-provider/pull/40 +[#119]: https://github.com/ergebnis/data-provider/pull/119 [@localheinz]: https://github.com/localheinz diff --git a/composer.json b/composer.json index 524dfdc..67677a6 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "source": "https://github.com/ergebnis/data-provider" }, "require": { - "php": "^7.4 || ^8.0", + "php": "^8.0", "fakerphp/faker": "^1.20.0" }, "require-dev": { @@ -45,7 +45,7 @@ "ergebnis/composer-normalize": true }, "platform": { - "php": "7.4.26" + "php": "8.0.25" }, "preferred-install": "dist", "sort-packages": true diff --git a/composer.lock b/composer.lock index 6b2bd5b..7dffb4b 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": "878f8dda5e3eb898386a3a857abb5f2f", + "content-hash": "b8cba7424a3f284336c7294a3cbcfd25", "packages": [ { "name": "fakerphp/faker", @@ -128,25 +128,25 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", + "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -175,7 +175,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2" }, "funding": [ { @@ -191,7 +191,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-01-02T09:55:41+00:00" } ], "packages-dev": [ @@ -4792,29 +4792,36 @@ }, { "name": "symfony/service-contracts", - "version": "v1.1.2", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0" + "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/191afdcb5804db960d26d8566b7e9a2843cab3a0", - "reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d78d39c1599bd1188b8e26bb341da52c3c6d8a66", + "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": ">=8.0.2", + "psr/container": "^2.0" + }, + "conflict": { + "ext-psr": "<1.1|>=2" }, "suggest": { - "psr/container": "", "symfony/service-implementation": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-main": "3.0-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -4847,9 +4854,23 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v1.1.2" + "source": "https://github.com/symfony/service-contracts/tree/v3.0.2" }, - "time": "2019-05-28T07:50:59+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-05-30T19:17:58+00:00" }, { "name": "symfony/stopwatch", @@ -5273,11 +5294,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.4 || ^8.0" + "php": "^8.0" }, "platform-dev": [], "platform-overrides": { - "php": "7.4.26" + "php": "8.0.25" }, "plugin-api-version": "2.3.0" }