Skip to content

Commit dad93d4

Browse files
committed
Merge branch '2.x-dev' into deeper-realtime-compiler-integration
2 parents 52fd8fd + 217aa73 commit dad93d4

File tree

3 files changed

+503
-508
lines changed

3 files changed

+503
-508
lines changed

.idea/develop.iml

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
"rector/rector": "^0.15.1",
3636
"squizlabs/php_codesniffer": "^3.7"
3737
},
38+
"conflict": {
39+
"symfony/string": ">=7.0"
40+
},
3841
"autoload": {
3942
"psr-4": {
4043
"App\\": "app/"
@@ -75,7 +78,6 @@
7578
"type": "vcs",
7679
"url": "https://github.com/caendesilva/psalm-coverage",
7780
"no-api": true
78-
7981
}
8082
]
8183
}

0 commit comments

Comments
 (0)