Skip to content

Commit 753ed73

Browse files
lcobuccilcobucci
authored
Merge pull request #196 from Ocramius/cleanup/remove-eol-php-versions-from-matrix
Cleanup/remove EOL PHP versions from matrix
2 parents d8f024c + afcb6fc commit 753ed73

File tree

57 files changed

+93
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+93
-147
lines changed

‎laminas-ci.schema.json‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
],
2525
"exclude": [
2626
{
27-
"name": "Codeception [7.4, latest]"
27+
"name": "Codeception [8.2, latest]"
2828
}
2929
],
3030
"ignore_php_platform_requirements": {
3131
"8.0": true,
32-
"7.4": false
32+
"8.2": false
3333
},
3434
"stablePHP": "8.0",
3535
"additional_composer_arguments": []
@@ -50,14 +50,14 @@
5050
"operatingSystem": "ubuntu-latest",
5151
"action": "laminas/laminas-continuous-integration-action@v1",
5252
"job": {
53-
"php": "7.4",
53+
"php": "8.2",
5454
"command": "find src/ -type f -name \"*.php\" -exec php -l {} \\;"
5555
}
5656
}
5757
],
5858
"ignore_php_platform_requirements": {
5959
"8.0": true,
60-
"7.4": false
60+
"8.2": false
6161
},
6262
"stablePHP": "8.0",
6363
"additional_composer_arguments": []
@@ -95,13 +95,13 @@
9595
[
9696
{
9797
"name": "Stringified job",
98-
"job": "{\"php\": \"7.4\", \"command\": \"php -v\"}"
98+
"job": "{\"php\": \"8.2\", \"command\": \"php -v\"}"
9999
},
100100
{
101101
"name": "JSON object job",
102102
"operatingSystem": "debian-latest",
103103
"job": {
104-
"php": "7.4",
104+
"php": "8.2",
105105
"command": "php -v"
106106
}
107107
}
@@ -281,7 +281,7 @@
281281
"examples": [
282282
[
283283
{
284-
"name": "Codeception [7.4, latest]"
284+
"name": "Codeception [8.2, latest]"
285285
}
286286
]
287287
],
@@ -290,7 +290,7 @@
290290
"title": "The job description to be excluded",
291291
"examples": [
292292
{
293-
"name": "Codeception [7.4, latest]"
293+
"name": "Codeception [8.2, latest]"
294294
}
295295
],
296296
"required": [
@@ -303,7 +303,7 @@
303303
"description": "The name of the job to be excluded. Must be an exact match.",
304304
"minLength": 1,
305305
"examples": [
306-
"Codeception [7.4, latest]"
306+
"Codeception [8.2, latest]"
307307
]
308308
}
309309
},
@@ -356,12 +356,6 @@
356356
"title": "The php version",
357357
"description": "The PHP version to be used. If the wildcard `*` is passed, a list of checks is created containing *every* supported PHP version by the project and the matrix action.",
358358
"enum": [
359-
"5.6",
360-
"7.0",
361-
"7.1",
362-
"7.2",
363-
"7.3",
364-
"7.4",
365359
"8.0",
366360
"8.1",
367361
"8.2",

‎src/config/app.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ describe('config/app', () => {
55
describe('gatherVersions()', () => {
66
test.each`
77
constraint | expected
8-
${'7.0'} | ${[ '7.0' ]}
9-
${'^7.0'} | ${[ '7.0', '7.1', '7.2', '7.3', '7.4' ]}
8+
${'7.0'} | ${[ ]}
9+
${'^7.0'} | ${[ ]}
1010
${'8.1'} | ${[ '8.1' ]}
1111
${'8.1.0'} | ${[ '8.1' ]}
1212
${'8.1.12'} | ${[ '8.1' ]}
@@ -16,8 +16,8 @@ describe('config/app', () => {
1616
${'~8.1'} | ${[ '8.1' ]}
1717
${'~8.1.0'} | ${[ '8.1' ]}
1818
${'~8.1.12'} | ${[ '8.1' ]}
19-
${'^7.4 || ~8.0.0 || ~8.1.12'} | ${[ '7.4', '8.0', '8.1' ]}
20-
${'<=8.1.0'} | ${[ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]}
19+
${'^7.4 || ~8.0.0 || ~8.1.12'} | ${[ '8.0', '8.1' ]}
20+
${'<=8.1.0'} | ${[ '8.0', '8.1' ]}
2121
`('for "$constraint" === $expected', ({constraint, expected}) => {
2222
expect(gatherVersions({require: {php: constraint}})).toEqual(expected);
2323
});

‎src/config/php.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
export const PHP_56 = '5.6';
2-
export const PHP_70 = '7.0';
3-
export const PHP_71 = '7.1';
4-
export const PHP_72 = '7.2';
5-
export const PHP_73 = '7.3';
6-
export const PHP_74 = '7.4';
71
export const PHP_80 = '8.0';
82
export const PHP_81 = '8.1';
93
export const PHP_82 = '8.2';
@@ -15,12 +9,6 @@ export const CURRENT_STABLE = PHP_80;
159
* If this list is being extended, please also update the `laminas-ci.schema.json` file as well.
1610
*/
1711
export const INSTALLABLE_VERSIONS = [
18-
PHP_56,
19-
PHP_70,
20-
PHP_71,
21-
PHP_72,
22-
PHP_73,
23-
PHP_74,
2412
PHP_80,
2513
PHP_81,
2614
PHP_82

‎tests/code-check-codeception-dist/.laminas-ci.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"stablePHP": "7.4"
2+
"stablePHP": "8.2"
33
}

‎tests/code-check-codeception-dist/matrix.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"include": [
33
{
4-
"name": "Codeception [7.4, latest]",
5-
"job": "{\"command\":\"./vendor/bin/codecept run\",\"php\":\"7.4\",\"extensions\":[],\"ini\":[],\"dependencies\":\"latest\",\"ignore_platform_reqs_8\":false,\"ignore_php_platform_requirement\":false,\"additional_composer_arguments\":[],\"before_script\":[]}",
4+
"name": "Codeception [8.2, latest]",
5+
"job": "{\"command\":\"./vendor/bin/codecept run\",\"php\":\"8.2\",\"extensions\":[],\"ini\":[],\"dependencies\":\"latest\",\"ignore_platform_reqs_8\":false,\"ignore_php_platform_requirement\":false,\"additional_composer_arguments\":[],\"before_script\":[]}",
66
"operatingSystem": "ubuntu-latest",
77
"action": "laminas/laminas-continuous-integration-action@v1"
88
}

‎tests/code-check-codeception-nodist/.laminas-ci.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"stablePHP": "7.4"
2+
"stablePHP": "8.2"
33
}

‎tests/code-check-codeception-nodist/matrix.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"include": [
33
{
4-
"name": "Codeception [7.4, latest]",
5-
"job": "{\"command\":\"./vendor/bin/codecept run\",\"php\":\"7.4\",\"extensions\":[],\"ini\":[],\"dependencies\":\"latest\",\"ignore_platform_reqs_8\":false,\"ignore_php_platform_requirement\":false,\"additional_composer_arguments\":[],\"before_script\":[]}",
4+
"name": "Codeception [8.2, latest]",
5+
"job": "{\"command\":\"./vendor/bin/codecept run\",\"php\":\"8.2\",\"extensions\":[],\"ini\":[],\"dependencies\":\"latest\",\"ignore_platform_reqs_8\":false,\"ignore_php_platform_requirement\":false,\"additional_composer_arguments\":[],\"before_script\":[]}",
66
"operatingSystem": "ubuntu-latest",
77
"action": "laminas/laminas-continuous-integration-action@v1"
88
}

‎tests/code-check-composer-require-checker/.laminas-ci.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"stablePHP": "7.4"
2+
"stablePHP": "8.2"
33
}

‎tests/code-check-composer-require-checker/matrix.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"include": [
33
{
4-
"name": "Composer Require Checker [7.4, latest]",
5-
"job": "{\"command\":\"./vendor/bin/composer-require-checker check --config-file=composer-require-checker.json -n -v composer.json\",\"php\":\"7.4\",\"extensions\":[],\"ini\":[],\"dependencies\":\"latest\",\"ignore_platform_reqs_8\":false,\"ignore_php_platform_requirement\":false,\"additional_composer_arguments\":[],\"before_script\":[]}",
4+
"name": "Composer Require Checker [8.2, latest]",
5+
"job": "{\"command\":\"./vendor/bin/composer-require-checker check --config-file=composer-require-checker.json -n -v composer.json\",\"php\":\"8.2\",\"extensions\":[],\"ini\":[],\"dependencies\":\"latest\",\"ignore_platform_reqs_8\":false,\"ignore_php_platform_requirement\":false,\"additional_composer_arguments\":[],\"before_script\":[]}",
66
"operatingSystem": "ubuntu-latest",
77
"action": "laminas/laminas-continuous-integration-action@v1"
88
}

‎tests/code-check-deprecated-exclusion-via-config/.laminas-ci.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"stablePHP": "7.4",
2+
"stablePHP": "8.2",
33
"exclude": [
44
{
5-
"name": "./vendor/bin/codecept run on PHP 7.4"
5+
"name": "./vendor/bin/codecept run on PHP 8.2"
66
},
77
{
8-
"name": "PHPUnit on PHP 7.4 with locked dependencies"
8+
"name": "PHPUnit on PHP 8.2 with locked dependencies"
99
},
1010
{
11-
"name": "PHPUnit on PHP 7.4 with latest dependencies"
11+
"name": "PHPUnit on PHP 8.2 with latest dependencies"
1212
}
1313
]
1414
}

0 commit comments

Comments
 (0)