Skip to content

Commit fa1189d

Browse files
driehledriehle
authored
Merge pull request #757 from driehle/drop-php80
Drop PHP 8.0
2 parents 7284f6b + 74f8d17 commit fa1189d

File tree

3 files changed

+54
-61
lines changed

3 files changed

+54
-61
lines changed

‎.github/workflows/continuous-integration.yml‎

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,21 @@ on:
44
pull_request:
55
branches:
66
- "*.x"
7+
paths:
8+
- ".github/workflows/continuous-integration.yml"
9+
- "composer.*"
10+
- "src/**"
11+
- "phpunit.xml.dist"
12+
- "tests/**"
713
push:
814
branches:
915
- "*.x"
16+
paths:
17+
- ".github/workflows/continuous-integration.yml"
18+
- "composer.*"
19+
- "src/**"
20+
- "phpunit.xml.dist"
21+
- "tests/**"
1022

1123
jobs:
1224
phpunit:
@@ -17,7 +29,6 @@ jobs:
1729
fail-fast: false
1830
matrix:
1931
php-version:
20-
- "8.0"
2132
- "8.1"
2233
- "8.2"
2334
- "8.3"
@@ -30,19 +41,19 @@ jobs:
3041
- true
3142
- false
3243
include:
33-
- php-version: "8.0"
44+
- php-version: "8.1"
3445
dbal-version: "2.13.0"
3546
dependencies: "lowest"
3647
optional-dependencies: false
37-
- php-version: "8.0"
48+
- php-version: "8.1"
3849
dbal-version: "3.3.0"
3950
dependencies: "lowest"
4051
optional-dependencies: false
41-
- php-version: "8.0"
52+
- php-version: "8.1"
4253
dbal-version: "2.13.0"
4354
dependencies: "lowest"
4455
optional-dependencies: true
45-
- php-version: "8.0"
56+
- php-version: "8.1"
4657
dbal-version: "3.3.0"
4758
dependencies: "lowest"
4859
optional-dependencies: true
@@ -61,26 +72,31 @@ jobs:
6172

6273
steps:
6374
- name: "Checkout"
64-
uses: "actions/checkout@v2"
75+
uses: "actions/checkout@v4"
6576
with:
6677
fetch-depth: 2
6778

68-
- name: "Install PHP"
79+
- name: "Install PHP with PCOV"
6980
uses: "shivammathur/setup-php@v2"
7081
with:
7182
php-version: "${{ matrix.php-version }}"
7283
coverage: "pcov"
73-
ini-values: "error_reporting=E_ALL, zend.assertions=1"
84+
ini-values: "zend.assertions=1"
7485
extensions: "pdo_mysql"
7586

87+
- name: "Set COMPOSER_ROOT_VERSION"
88+
run: |
89+
echo "COMPOSER_ROOT_VERSION=${{ inputs.composer-root-version }}" >> $GITHUB_ENV
90+
if: "${{ inputs.composer-root-version }}"
91+
7692
- name: "Require specific DBAL version"
7793
run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
7894

7995
- name: "Install dependencies with Composer"
80-
uses: "ramsey/composer-install@v1"
96+
uses: "ramsey/composer-install@v3"
8197
with:
8298
dependency-versions: "${{ matrix.dependencies }}"
83-
composer-options: "--prefer-dist --no-suggest"
99+
composer-options: "${{ inputs.composer-options }}"
84100

85101
- name: "Remove optional dependencies"
86102
if: "! matrix.optional-dependencies"
@@ -103,29 +119,31 @@ jobs:
103119
run: "./ci/run-cli-migrations.sh"
104120

105121
- name: "Upload coverage file"
106-
uses: "actions/upload-artifact@v2"
122+
uses: "actions/upload-artifact@v4"
107123
with:
108-
name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ matrix.dbal-version }}.coverage"
124+
name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ matrix.optional-dependencies }}-${{ matrix.dbal-version }}.coverage"
109125
path: "coverage.xml"
110126

111127
upload_coverage:
112128
name: "Upload coverage to Codecov"
113-
runs-on: "ubuntu-20.04"
129+
runs-on: "ubuntu-22.04"
114130
needs:
115131
- "phpunit"
116132

117133
steps:
118134
- name: "Checkout"
119-
uses: "actions/checkout@v2"
135+
uses: "actions/checkout@v4"
120136
with:
121137
fetch-depth: 2
122138

123139
- name: "Download coverage files"
124-
uses: "actions/download-artifact@v4.1.7"
140+
uses: "actions/download-artifact@v4"
125141
with:
126142
path: "reports"
127143

128144
- name: "Upload to Codecov"
129-
uses: "codecov/codecov-action@v1"
145+
uses: "codecov/codecov-action@v5"
130146
with:
131147
directory: "reports"
148+
env:
149+
CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

‎composer.json‎

Lines changed: 18 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,17 @@
11
{
22
"name": "doctrine/doctrine-orm-module",
33
"description": "Laminas Module that provides Doctrine ORM functionality",
4-
"type": "library",
54
"license": "MIT",
5+
"type": "library",
66
"keywords": [
77
"doctrine",
88
"orm",
99
"module",
1010
"laminas"
1111
],
12-
"homepage": "http://www.doctrine-project.org/",
13-
"authors": [
14-
{
15-
"name": "Kyle Spraggs",
16-
"email": "[email protected]",
17-
"homepage": "http://www.spiffyjr.me/"
18-
},
19-
{
20-
"name": "Marco Pivetta",
21-
"email": "[email protected]",
22-
"homepage": "http://marco-pivetta.com/"
23-
},
24-
{
25-
"name": "Evan Coury",
26-
"email": "[email protected]",
27-
"homepage": "http://blog.evan.pro/"
28-
},
29-
{
30-
"name": "Guilherme Blanco",
31-
"email": "[email protected]"
32-
},
33-
{
34-
"name": "Tom H Anderson",
35-
"email": "[email protected]"
36-
}
37-
],
38-
"config": {
39-
"sort-packages": true,
40-
"allow-plugins": {
41-
"composer/package-versions-deprecated": true,
42-
"dealerdirect/phpcodesniffer-composer-installer": true
43-
}
44-
},
45-
"extra": {
46-
"laminas": {
47-
"config-provider": "DoctrineORMModule\\ConfigProvider",
48-
"module": "DoctrineORMModule"
49-
}
50-
},
12+
"homepage": "https://www.doctrine-project.org/",
5113
"require": {
52-
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
14+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
5315
"ext-json": "*",
5416
"doctrine/dbal": "^2.13.7 || ^3.3.2",
5517
"doctrine/doctrine-laminas-hydrator": "^3.0.0",
@@ -88,9 +50,9 @@
8850
"doctrine/migrations": "<3.3"
8951
},
9052
"suggest": {
91-
"laminas/laminas-form": "if you want to use form elements backed by Doctrine",
53+
"doctrine/migrations": "doctrine migrations if you want to keep your schema definitions versioned",
9254
"laminas/laminas-developer-tools": "laminas-developer-tools if you want to profile operations executed by the ORM during development",
93-
"doctrine/migrations": "doctrine migrations if you want to keep your schema definitions versioned"
55+
"laminas/laminas-form": "if you want to use form elements backed by Doctrine"
9456
},
9557
"autoload": {
9658
"psr-4": {
@@ -102,6 +64,19 @@
10264
"DoctrineORMModuleTest\\": "tests/"
10365
}
10466
},
67+
"config": {
68+
"allow-plugins": {
69+
"composer/package-versions-deprecated": true,
70+
"dealerdirect/phpcodesniffer-composer-installer": true
71+
},
72+
"sort-packages": true
73+
},
74+
"extra": {
75+
"laminas": {
76+
"config-provider": "DoctrineORMModule\\ConfigProvider",
77+
"module": "DoctrineORMModule"
78+
}
79+
},
10580
"scripts": {
10681
"check": [
10782
"@cs-check",

‎phpcs.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<arg name="cache" value=".phpcs.cache"/>
77
<arg name="colors"/>
88

9-
<!-- set minimal required PHP version (8.0) -->
10-
<config name="php_version" value="80000"/>
9+
<!-- set minimal required PHP version (8.1) -->
10+
<config name="php_version" value="80100"/>
1111

1212
<!-- Ignore warnings, show progress of the run and show sniff names -->
1313
<arg value="nps"/>

0 commit comments

Comments
 (0)