Skip to content

Commit eb4a0a9

Browse files
theofidrytheofidry
committed
Merge remote-tracking branch 'upstream/main' into build/stubs
2 parents 48de8cf + cf37d93 commit eb4a0a9

File tree

19 files changed

+2594
-1212
lines changed

19 files changed

+2594
-1212
lines changed

‎.github/dependabot.yml‎

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,40 @@ updates:
55
schedule:
66
interval: "weekly"
77
groups:
8+
jetbrains-phpstorm-stubs:
9+
patterns:
10+
- "jetbrains/phpstorm-stubs"
11+
update-types:
12+
- "major"
13+
nikic/php-parser:
14+
patterns:
15+
- "nikic/php-parser"
16+
update-types:
17+
- "major"
818
dependencies:
919
patterns:
1020
- "*"
1121

1222
- package-ecosystem: "composer"
13-
directory: "."
23+
directory: "vendor-bin/php-cs-fixer/"
1424
schedule:
1525
interval: "weekly"
1626
groups:
17-
jetbrains-phpstorm-stubs:
27+
dependencies:
1828
patterns:
19-
- "jetbrains/phpstorm-stubs"
20-
update-types:
21-
- "major"
29+
- "*"
30+
31+
- package-ecosystem: "composer"
32+
directory: "vendor-bin/phpstan/"
33+
schedule:
34+
interval: "weekly"
35+
groups:
36+
dependencies:
37+
patterns:
38+
- "*"
2239

2340
- package-ecosystem: "composer"
24-
directory: "vendor-bin/*/"
41+
directory: "vendor-bin/rector/"
2542
schedule:
2643
interval: "weekly"
2744
groups:
@@ -38,6 +55,33 @@ updates:
3855
patterns:
3956
- "*"
4057

58+
- package-ecosystem: "composer"
59+
directory: "/Users/tfidry/Project/Humbug/php-scoper/fixtures/set027-laravel"
60+
schedule:
61+
interval: "weekly"
62+
groups:
63+
dependencies:
64+
patterns:
65+
- "*"
66+
67+
- package-ecosystem: "composer"
68+
directory: "/Users/tfidry/Project/Humbug/php-scoper/fixtures/set041-symfony64"
69+
schedule:
70+
interval: "weekly"
71+
groups:
72+
dependencies:
73+
patterns:
74+
- "*"
75+
76+
- package-ecosystem: "composer"
77+
directory: "/Users/tfidry/Project/Humbug/php-scoper/fixtures/set042-symfony7"
78+
schedule:
79+
interval: "weekly"
80+
groups:
81+
dependencies:
82+
patterns:
83+
- "*"
84+
4185
- package-ecosystem: "github-actions"
4286
directory: ".github"
4387
schedule:

‎.github/workflows/composer-root-version.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
php: [ '8.4' ]
57+
php: [ '8.5' ]
5858

5959
steps:
6060
- name: Checkout
@@ -108,7 +108,7 @@ jobs:
108108
- name: Setup PHP
109109
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
110110
with:
111-
php-version: '8.4'
111+
php-version: '8.5'
112112
tools: composer
113113
coverage: none
114114

‎.github/workflows/e2e-tests.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- '8.2'
2727
- '8.3'
2828
- '8.4'
29+
- '8.5'
2930
steps:
3031
- name: Checkout
3132
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -78,8 +79,6 @@ jobs:
7879
- 'e2e_024'
7980
- 'e2e_025'
8081
- 'e2e_027'
81-
- 'e2e_041'
82-
- 'e2e_042'
8382
- 'e2e_029'
8483
- 'e2e_030'
8584
- 'e2e_031'
@@ -90,10 +89,13 @@ jobs:
9089
- 'e2e_036'
9190
- 'e2e_037'
9291
- 'e2e_040'
92+
- 'e2e_041'
93+
- 'e2e_042'
9394
php:
9495
- '8.2'
9596
- '8.3'
9697
- '8.4'
98+
- '8.5'
9799
composer:
98100
- 'composer:2.2'
99101
- 'composer'
@@ -161,7 +163,7 @@ jobs:
161163
fail-fast: false
162164
matrix:
163165
php-version:
164-
- '8.4'
166+
- '8.5'
165167
coverage:
166168
- xdebug
167169

‎.github/workflows/lint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Setup PHP
4949
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
5050
with:
51-
php-version: '8.4'
51+
php-version: '8.5'
5252
tools: composer
5353
coverage: none
5454

‎.github/workflows/tests.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup PHP
3030
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
3131
with:
32-
php-version: '8.4'
32+
php-version: '8.5'
3333
tools: composer
3434
coverage: none
3535

@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup PHP
5454
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
5555
with:
56-
php-version: '8.4'
56+
php-version: '8.5'
5757
tools: composer
5858
coverage: none
5959

@@ -70,6 +70,7 @@ jobs:
7070
- '8.2'
7171
- '8.3'
7272
- '8.4'
73+
- '8.5'
7374
symfony:
7475
- 'unchanged'
7576
- '6.4.*'

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ e2e: e2e_004 \
168168
e2e_024 \
169169
e2e_025 \
170170
e2e_027 \
171-
e2e_041 \
172-
e2e_042 \
173171
e2e_029 \
174172
e2e_030 \
175173
e2e_031 \
@@ -181,7 +179,9 @@ e2e: e2e_004 \
181179
e2e_037 \
182180
e2e_038 \
183181
e2e_039 \
184-
e2e_040
182+
e2e_040 \
183+
e2e_041 \
184+
e2e_042
185185

186186
.PHONY: blackfire
187187
blackfire: ## Runs Blackfire profiling

‎composer-root-version-checker/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"require": {
77
"php": "^8.2",
88
"psr/log": "^3.0",
9-
"thecodingmachine/safe": "^2.4"
9+
"thecodingmachine/safe": "^3.3"
1010
},
1111
"require-dev": {
1212
"ergebnis/composer-normalize": "^2.29",

‎composer-root-version-checker/composer.lock‎

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

‎composer.lock‎

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

0 commit comments

Comments
 (0)