Skip to content

Commit 96afca0

Browse files
committed
PHP 7.4 is minimum version
1 parent ca94d18 commit 96afca0

File tree

16 files changed

+1876
-1290
lines changed

16 files changed

+1876
-1290
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ jobs:
66
strategy:
77
matrix:
88
php-version:
9-
- '7.2'
10-
- '7.3'
119
- '7.4'
1210
- '8.0'
1311
- '8.1'
@@ -32,10 +30,6 @@ jobs:
3230
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
3331
restore-keys: ${{ runner.os }}-composer-
3432

35-
- name: Remove lock for newer PHP
36-
if: matrix.php-version != '7.2'
37-
run: rm composer.lock && composer require symfony/cache
38-
3933
- name: Install dependencies
4034
run: composer install
4135

.php-cs-fixer.dist.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
'array_indentation' => true,
1616
'array_push' => true,
1717
'array_syntax' => ['syntax' => 'short'],
18-
'assign_null_coalescing_to_coalesce_equal' => false, // Require PHP 7.4
18+
'assign_null_coalescing_to_coalesce_equal' => true,
1919
'backtick_to_shell_exec' => true,
2020
'binary_operator_spaces' => true,
2121
'blank_line_after_namespace' => true,
@@ -68,7 +68,7 @@
6868
'global_namespace_import' => true,
6969
'group_import' => false, // I feel it makes the code actually harder to read
7070
'header_comment' => false, // We don't use common header in all our files
71-
'heredoc_indentation' => false, // Requires PHP >= 7.3
71+
'heredoc_indentation' => true,
7272
'heredoc_to_nowdoc' => false, // We often use variable in heredoc
7373
'implode_call' => true,
7474
'include' => true,
@@ -241,11 +241,11 @@
241241
'ternary_operator_spaces' => true,
242242
'ternary_to_elvis_operator' => true,
243243
'ternary_to_null_coalescing' => true,
244-
'trailing_comma_in_multiline' => false, // Require PHP 7.3
244+
'trailing_comma_in_multiline' => true,
245245
'trim_array_spaces' => true,
246246
'types_spaces' => true,
247247
'unary_operator_spaces' => true,
248-
'use_arrow_functions' => false, // Require PHP 7.4
248+
'use_arrow_functions' => true,
249249
'visibility_required' => true,
250250
'void_return' => true,
251251
'whitespace_after_comma_in_array' => true,

composer.json

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
"description": "Various utilities tailored for our ecosystem",
44
"type": "library",
55
"license": "MIT",
6+
"config": {
7+
"sort-packages": true,
8+
"allow-plugins": {
9+
"composer/package-versions-deprecated": true
10+
}
11+
},
612
"scripts": {
713
"check": [
814
"php-cs-fixer fix --ansi --dry-run --diff",
@@ -32,31 +38,32 @@
3238
}
3339
},
3440
"require": {
35-
"php": "^7.2 || ^8.0",
41+
"php": "^7.4 || ^8.0",
3642
"ext-bcmath": "*",
3743
"ext-fileinfo": "*",
3844
"ext-json": "*",
3945
"ext-pdo": "*",
46+
"cakephp/chronos": "^2.3",
4047
"doctrine/dbal": "^2.13",
4148
"doctrine/migrations": "^2.2 || ^3.0",
42-
"cakephp/chronos": "^2.1",
43-
"ecodev/graphql-doctrine": "^7.1",
49+
"ecodev/graphql-doctrine": "^7.2",
4450
"imagine/imagine": "^1.2",
45-
"laminas/laminas-diactoros": "^2.4",
46-
"laminas/laminas-log": "^2.12",
47-
"laminas/laminas-mail": "^2.12",
48-
"laminas/laminas-permissions-acl": "^2.7",
49-
"laminas/laminas-servicemanager": "^3.5",
50-
"laminas/laminas-validator": "^2.13",
51-
"laminas/laminas-view": "^2.11",
52-
"mezzio/mezzio-session": "^1.3",
53-
"moneyphp/money": "^3.3"
51+
"laminas/laminas-diactoros": "^2.8",
52+
"laminas/laminas-log": "^2.15",
53+
"laminas/laminas-mail": "^2.15",
54+
"laminas/laminas-permissions-acl": "^2.9",
55+
"laminas/laminas-servicemanager": "^3.10",
56+
"laminas/laminas-validator": "^2.16",
57+
"laminas/laminas-view": "^2.19",
58+
"mezzio/mezzio-session": "^1.6",
59+
"moneyphp/money": "^3.3",
60+
"symfony/cache": "^5.4"
5461
},
5562
"require-dev": {
5663
"friendsofphp/php-cs-fixer": "@stable",
5764
"mikey179/vfsstream": "@stable",
5865
"phpstan/phpstan": "@stable",
59-
"phpunit/phpunit": "@stable",
60-
"phpstan/phpstan-phpunit": "@stable"
66+
"phpstan/phpstan-phpunit": "@stable",
67+
"phpunit/phpunit": "@stable"
6168
}
6269
}

0 commit comments

Comments
 (0)