Skip to content

Commit 74e75f3

Browse files
authored
SF7, other deps and code refactoring (#493)
SF7 and code refactoring
1 parent bfceee5 commit 74e75f3

File tree

266 files changed

+3512
-4504
lines changed

Some content is hidden

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

266 files changed

+3512
-4504
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ block_comment_end = */
1717
[{*.yml,*.yaml}]
1818
indent_size = 2
1919

20+
[*.neon]
21+
indent_style = tab
22+
2023
[*.md]
2124
trim_trailing_whitespace = false
2225

.github/workflows/integrate.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: "ubuntu-latest"
1515
steps:
1616
- name: "Checkout code"
17-
uses: "actions/checkout@v3"
17+
uses: "actions/checkout@v4"
1818

1919
- name: "Check file permissions"
2020
run: |
@@ -34,7 +34,7 @@ jobs:
3434
php-version: "8.1"
3535

3636
- name: "Checkout code"
37-
uses: "actions/checkout@v3"
37+
uses: "actions/checkout@v4"
3838

3939
- name: "Install dependencies"
4040
uses: "ramsey/composer-install@v2"
@@ -68,7 +68,7 @@ jobs:
6868
coverage: "xdebug"
6969

7070
- name: "Checkout code"
71-
uses: "actions/checkout@v3"
71+
uses: "actions/checkout@v4"
7272

7373
- name: "Install dependencies"
7474
uses: "ramsey/composer-install@v2"
@@ -101,7 +101,7 @@ jobs:
101101
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
102102

103103
- name: "Checkout code"
104-
uses: "actions/checkout@v3"
104+
uses: "actions/checkout@v4"
105105

106106
- name: "Validate Composer configuration"
107107
run: "composer validate --strict"
@@ -129,7 +129,7 @@ jobs:
129129
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
130130

131131
- name: "Checkout code"
132-
uses: "actions/checkout@v3"
132+
uses: "actions/checkout@v4"
133133

134134
- name: "Check adherence to EditorConfig"
135135
uses: "greut/eclint-action@v0"
@@ -157,7 +157,7 @@ jobs:
157157
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
158158

159159
- name: "Checkout code"
160-
uses: "actions/checkout@v3"
160+
uses: "actions/checkout@v4"
161161

162162
- name: "Fetch Git base reference"
163163
run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"
@@ -186,7 +186,7 @@ jobs:
186186
coverage: "xdebug"
187187

188188
- name: "Checkout code"
189-
uses: "actions/checkout@v3"
189+
uses: "actions/checkout@v4"
190190

191191
- name: "Fetch Git base reference"
192192
run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"
@@ -208,7 +208,7 @@ jobs:
208208
runs-on: "ubuntu-20.04"
209209
steps:
210210
- name: "Checkout code"
211-
uses: "actions/checkout@v3"
211+
uses: "actions/checkout@v4"
212212

213213
- name: "Check exported files"
214214
run: |

composer.json

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,19 @@
9999
"ext-mbstring": "*",
100100
"ext-openssl": "*",
101101
"ext-sodium": "*",
102-
"brick/math": "^0.9|^0.10|^0.11",
102+
"brick/math": "^0.9|^0.10|^0.11|^0.12",
103103
"paragonie/constant_time_encoding": "^2.4",
104104
"psr/clock": "^1.0",
105105
"psr/event-dispatcher": "^1.0",
106106
"psr/http-client": "^1.0",
107107
"psr/http-factory": "^1.0",
108108
"spomky-labs/aes-key-wrap": "^7.0",
109109
"spomky-labs/pki-framework": "^1.0",
110-
"symfony/config": "^5.4|^6.0",
111-
"symfony/console": "^5.4|^6.0",
112-
"symfony/dependency-injection": "^5.4|^6.0",
113-
"symfony/event-dispatcher": "^5.4|^6.0",
114-
"symfony/http-kernel": "^5.4|^6.0",
110+
"symfony/config": "^5.4|^6.0|^7.0",
111+
"symfony/console": "^5.4|^6.0|^7.0",
112+
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
113+
"symfony/event-dispatcher": "^5.4|^6.0|^7.0",
114+
"symfony/http-kernel": "^5.4|^6.0|^7.0",
115115
"symfony/polyfill-mbstring": "^1.12"
116116
},
117117
"require-dev": {
@@ -121,7 +121,7 @@
121121
"blackfire/php-sdk": "^2.0",
122122
"ekino/phpstan-banned-code": "^1.0",
123123
"infection/infection": "^0.27",
124-
"matthiasnoback/symfony-config-test": "^4.3.0",
124+
"matthiasnoback/symfony-config-test": "^5.0",
125125
"nyholm/psr7": "^1.5",
126126
"php-http/mock-client": "^1.5",
127127
"php-parallel-lint/php-parallel-lint": "^1.3",
@@ -131,20 +131,19 @@
131131
"phpstan/phpstan-deprecation-rules": "^1.0",
132132
"phpstan/phpstan-phpunit": "^1.1",
133133
"phpstan/phpstan-strict-rules": "^1.4",
134-
"phpunit/phpunit": "^9.5.23",
134+
"phpunit/phpunit": "^10.1",
135135
"qossmic/deptrac-shim": "^1.0",
136-
"rector/rector": "^0.16",
136+
"rector/rector": "^0.18",
137137
"roave/security-advisories": "dev-latest",
138-
"symfony/browser-kit": "^6.1.3",
139-
"symfony/finder": "^5.4|^6.0",
140-
"symfony/framework-bundle": "^6.1.3",
141-
"symfony/http-client": "^5.4|^6.0",
142-
"symfony/phpunit-bridge": "^6.1.3",
143-
"symfony/serializer": "^6.1.3",
144-
"symfony/var-dumper": "^6.1.3",
145-
"symfony/yaml": "^6.1.3",
146-
"symplify/easy-coding-standard": "^11.0",
147-
"symplify/monorepo-builder": "11.2.3.72"
138+
"symfony/browser-kit": "^6.1|^7.0",
139+
"symfony/finder": "^6.1|^7.0",
140+
"symfony/framework-bundle": "^6.1|^7.0",
141+
"symfony/http-client": "^6.1|^7.0",
142+
"symfony/phpunit-bridge": "^6.1|^7.0",
143+
"symfony/serializer": "^6.1|^7.0",
144+
"symfony/var-dumper": "^6.1|^7.0",
145+
"symfony/yaml": "^6.1|^7.0",
146+
"symplify/easy-coding-standard": "^12.0"
148147
},
149148
"replace": {
150149
"web-token/encryption-pack": "self.version",

ecs.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@
8787
'import_functions' => true,
8888
]);
8989

90-
$config->services()
91-
->remove(PhpUnitTestClassRequiresCoversFixer::class);
90+
$config->skip([
91+
PhpUnitTestClassRequiresCoversFixer::class
92+
]);
9293
$config->parallel();
9394
$config->paths([
9495
__DIR__ . '/performance',

monorepo-builder.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)