Skip to content

Commit c2bdeac

Browse files
anomiexmatticbot
anomiex
authored and
matticbot
committed
Update PHPUnit stubs to PHPUnit 11.5 (#42591)
This needs some changes to the munger: * `@psalm-` annotations seem mostly replaced with `@phpstan-`. * Some bad phpdocs have been fixed. This also calls for some cleanups of things deprecated or removed in PHPUnit 11: * `MockBuilder->addMethods()` is deprecated with no replacement. We often used this to "mock" stdClass; now, instead, we need to either use anonymous classes or mock a dummy interface. * `->getMockForAbstractClass()` is also deprecated. Can be replaced with `->onlyMethods( ... )->getMock()` but we have to manually list the needed methods. * `->getMockForTrait()` as well. Anonymous classes work well here. * `TestCase->returnValue()` is deprecated in favor of `$double->willReturn()`. * `TestCase->addWarning()` is gone. Seems to work replacing it with `trigger_error( E_USER_WARNING )`. * packages/masterbar: `Base_Admin_Menu_Test` has some of the same weirdness `WPcom_Admin_Menu_Test` did before #42504, just less obviously so. * plugins/jetpack: `Jetpack_Client_Server_Test` seems to have been creating unused mocks since #14043. Removed them. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/13956378052 Upstream-Ref: Automattic/jetpack@281a100
1 parent 474a530 commit c2bdeac

File tree

5 files changed

+131
-131
lines changed

5 files changed

+131
-131
lines changed

‎jetpack_vendor/i18n-map.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
),
1111
'jetpack-assets' => array(
1212
'path' => 'jetpack_vendor/automattic/jetpack-assets',
13-
'ver' => '4.0.14-alpha1742415897',
13+
'ver' => '4.0.14-alpha1742417137',
1414
),
1515
'jetpack-boost-core' => array(
1616
'path' => 'jetpack_vendor/automattic/jetpack-boost-core',
@@ -26,7 +26,7 @@
2626
),
2727
'jetpack-connection' => array(
2828
'path' => 'jetpack_vendor/automattic/jetpack-connection',
29-
'ver' => '6.7.7-alpha1742415897',
29+
'ver' => '6.7.7-alpha1742417137',
3030
),
3131
'jetpack-explat' => array(
3232
'path' => 'jetpack_vendor/automattic/jetpack-explat',

‎vendor/composer/installed.json

+33-33
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dist": {
88
"type": "path",
99
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
10-
"reference": "ec718eb299167d9c1bee20c9bcb28e137c2e35c3"
10+
"reference": "233b6a448f6f3692807106351a4ce06395725b35"
1111
},
1212
"require": {
1313
"php": ">=7.2"
@@ -64,7 +64,7 @@
6464
"dist": {
6565
"type": "path",
6666
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
67-
"reference": "5299c1251fa8bc18153a0d936cdf1d3eb66fe875"
67+
"reference": "ab072c8f641ebd9a15b68776c5c8da8d0b15f80b"
6868
},
6969
"require": {
7070
"php": ">=7.2"
@@ -122,12 +122,12 @@
122122
},
123123
{
124124
"name": "automattic/jetpack-assets",
125-
"version": "4.0.14-alpha.1742415897",
126-
"version_normalized": "4.0.14.0-alpha1742415897",
125+
"version": "4.0.14-alpha.1742417137",
126+
"version_normalized": "4.0.14.0-alpha1742417137",
127127
"dist": {
128128
"type": "path",
129129
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
130-
"reference": "fa229d3a7ca742aeae21a1c5399db784f4e0e2cc"
130+
"reference": "05c4a8b7658b5a275f5b5cc187c7f287b65609ff"
131131
},
132132
"require": {
133133
"automattic/jetpack-constants": "^3.0.5-alpha",
@@ -200,7 +200,7 @@
200200
"dist": {
201201
"type": "path",
202202
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
203-
"reference": "dc8d1304c1d6674502b8df4001c8abb6d9863419"
203+
"reference": "36946e8ac3ca7e884befafe219cb51169b5181b5"
204204
},
205205
"require": {
206206
"composer-plugin-api": "^2.2",
@@ -272,7 +272,7 @@
272272
"dist": {
273273
"type": "path",
274274
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
275-
"reference": "9e9f647713c925a993b95a5894da1b445dabd907"
275+
"reference": "c7468e50e5ad6c7efb265a4170618c7f6378b3cf"
276276
},
277277
"require": {
278278
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -331,7 +331,7 @@
331331
"dist": {
332332
"type": "path",
333333
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
334-
"reference": "f0ac191fb99ce73ac5d141b198a3133ac099d3a1"
334+
"reference": "eda71fb3ca9cd3f340081f81e77514953dc11c7f"
335335
},
336336
"require": {
337337
"automattic/jetpack-boost-core": "^0.3.9-alpha",
@@ -399,7 +399,7 @@
399399
"dist": {
400400
"type": "path",
401401
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
402-
"reference": "3f8cfac0bce34b370c7506ea431f8fb22d59594a"
402+
"reference": "e0d54829ae00d84de0c5530c71fbaee00af693b6"
403403
},
404404
"require": {
405405
"composer-plugin-api": "^2.2",
@@ -463,7 +463,7 @@
463463
"dist": {
464464
"type": "path",
465465
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
466-
"reference": "082fc20cc47b871ce2e14bb06bbff3be034b40cd"
466+
"reference": "80294e361c39b816401a253ca910e0380f8f6605"
467467
},
468468
"require": {
469469
"php": ">=7.2"
@@ -533,12 +533,12 @@
533533
},
534534
{
535535
"name": "automattic/jetpack-connection",
536-
"version": "6.7.7-alpha.1742415897",
537-
"version_normalized": "6.7.7.0-alpha1742415897",
536+
"version": "6.7.7-alpha.1742417137",
537+
"version_normalized": "6.7.7.0-alpha1742417137",
538538
"dist": {
539539
"type": "path",
540540
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
541-
"reference": "089a8713f03104a978f138b43ae03f6ef6b64392"
541+
"reference": "6c167752c0a1fba06624a0633f17a523c4626a62"
542542
},
543543
"require": {
544544
"automattic/jetpack-a8c-mc-stats": "^3.0.4-alpha",
@@ -626,7 +626,7 @@
626626
"dist": {
627627
"type": "path",
628628
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
629-
"reference": "c98adfa0036f71dab060ec560d51983bc7efad28"
629+
"reference": "280924c90d8b5ffc4ef275d96b815d183f1f38d4"
630630
},
631631
"require": {
632632
"php": ">=7.2"
@@ -684,7 +684,7 @@
684684
"dist": {
685685
"type": "path",
686686
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
687-
"reference": "921596c8452403791befcf257fa516e5fbd437d8"
687+
"reference": "7f8e1142896063edeaaab62d3c31186205051b9c"
688688
},
689689
"require": {
690690
"php": ">=7.2"
@@ -741,7 +741,7 @@
741741
"dist": {
742742
"type": "path",
743743
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
744-
"reference": "8a17b782cf53ae7b332a5f47b104c50574baba01"
744+
"reference": "e548359f6d3a5735908b2b85c12c98678ad519c1"
745745
},
746746
"require": {
747747
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -820,7 +820,7 @@
820820
"dist": {
821821
"type": "path",
822822
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
823-
"reference": "c47dcf8e3797ecab05b87f4893486ecf4b4b365a"
823+
"reference": "6b52f4ee664ffca379767267b8e36386c4f96221"
824824
},
825825
"require": {
826826
"php": ">=7.2"
@@ -882,7 +882,7 @@
882882
"dist": {
883883
"type": "path",
884884
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
885-
"reference": "edce961d02cf2a8794e97b8e8e52a236e1b808f0"
885+
"reference": "b7ce553b6c4685283fc2ab8f825eac7f8c8b4753"
886886
},
887887
"require": {
888888
"automattic/jetpack-a8c-mc-stats": "^3.0.4-alpha",
@@ -961,7 +961,7 @@
961961
"dist": {
962962
"type": "path",
963963
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
964-
"reference": "c029c3841a8c4ce66f383f32ac2353cae35c7d5a"
964+
"reference": "fc74525b689288727fd4662e2871f2fc0f176920"
965965
},
966966
"require": {
967967
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -1021,7 +1021,7 @@
10211021
"dist": {
10221022
"type": "path",
10231023
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
1024-
"reference": "bf5463f26169356daccb7144d5c5b5cebc14f5b2"
1024+
"reference": "bc998bc8fb3013553b2482a06d4ab2547445328b"
10251025
},
10261026
"require": {
10271027
"php": ">=7.2"
@@ -1078,7 +1078,7 @@
10781078
"dist": {
10791079
"type": "path",
10801080
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
1081-
"reference": "1f3c2be375e484f2211c9fa1e12685d78c8389a1"
1081+
"reference": "25d053a1938055f5417b86260f068b45d79207f9"
10821082
},
10831083
"require": {
10841084
"automattic/jetpack-admin-ui": "^0.5.7-alpha",
@@ -1178,7 +1178,7 @@
11781178
"dist": {
11791179
"type": "path",
11801180
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
1181-
"reference": "ab8865bf0d6e3c7eed1eb730761d2e5e09e29fcb"
1181+
"reference": "34b4064d787dc605ae35d45e158fdc9fffbd7407"
11821182
},
11831183
"require": {
11841184
"php": ">=7.2"
@@ -1237,7 +1237,7 @@
12371237
"dist": {
12381238
"type": "path",
12391239
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
1240-
"reference": "d38e899940dcf47085fe8532a43516c2422038f1"
1240+
"reference": "c7081a405b2065bd2232ac09867ecd652d36a04f"
12411241
},
12421242
"require": {
12431243
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -1303,7 +1303,7 @@
13031303
"dist": {
13041304
"type": "path",
13051305
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
1306-
"reference": "48ac3a67eb7d808ae4593e373fd021ce13b38d80"
1306+
"reference": "07079be5371365d399eb6659bbd1a077cafc5ff9"
13071307
},
13081308
"require": {
13091309
"automattic/jetpack-a8c-mc-stats": "^3.0.4-alpha",
@@ -1363,7 +1363,7 @@
13631363
"dist": {
13641364
"type": "path",
13651365
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
1366-
"reference": "2d5cb43f0833e00e72605ffff0c51e37dd0de4ed"
1366+
"reference": "36153700def00d385685d2a42f554e2a7d160124"
13671367
},
13681368
"require": {
13691369
"automattic/jetpack-redirect": "^3.0.5-alpha",
@@ -1432,7 +1432,7 @@
14321432
"dist": {
14331433
"type": "path",
14341434
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
1435-
"reference": "ba6fb6687561764f2d15e4b3e6fc5fd7723cd988"
1435+
"reference": "363d2f223b01d0de808f7c5526208a4b2b70cf03"
14361436
},
14371437
"require": {
14381438
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -1505,7 +1505,7 @@
15051505
"dist": {
15061506
"type": "path",
15071507
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
1508-
"reference": "1a3933c84b9012dc68c0963cbd1ada66e6c6c7b9"
1508+
"reference": "067c6e096a68f99cbe0056c3b552af4dc258e828"
15091509
},
15101510
"require": {
15111511
"automattic/jetpack-status": "^5.0.10-alpha",
@@ -1564,7 +1564,7 @@
15641564
"dist": {
15651565
"type": "path",
15661566
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
1567-
"reference": "3e3246350b1eb3257ec5c6fcf352cfaddfebad72"
1567+
"reference": "5be139eec1a33d1a8ffb60cd11b862be600c7329"
15681568
},
15691569
"require": {
15701570
"php": ">=7.2"
@@ -1617,12 +1617,12 @@
16171617
},
16181618
{
16191619
"name": "automattic/jetpack-status",
1620-
"version": "5.0.10-alpha.1742415897",
1621-
"version_normalized": "5.0.10.0-alpha1742415897",
1620+
"version": "5.0.10-alpha.1742417137",
1621+
"version_normalized": "5.0.10.0-alpha1742417137",
16221622
"dist": {
16231623
"type": "path",
16241624
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
1625-
"reference": "f89d9cfff3bee0c7bc036d6609ec2351d259a681"
1625+
"reference": "6fb43977580fb617d47470411d876bfe89b64e96"
16261626
},
16271627
"require": {
16281628
"automattic/jetpack-constants": "^3.0.5-alpha",
@@ -1690,7 +1690,7 @@
16901690
"dist": {
16911691
"type": "path",
16921692
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
1693-
"reference": "4c712b07c7b23ed47c4b240c49c4f2f76572b17c"
1693+
"reference": "3c7174d78a148303f0e99e59e2aa23b3370922e7"
16941694
},
16951695
"require": {
16961696
"automattic/jetpack-connection": "^6.7.7-alpha",
@@ -1766,7 +1766,7 @@
17661766
"dist": {
17671767
"type": "path",
17681768
"url": "/tmp/jetpack-build/Automattic/jetpack-videopress",
1769-
"reference": "fd21f0d32982e9346d6767c32b42ac885dbf8641"
1769+
"reference": "fe2e01fc4972bb3217e1fed230a6bc421c179464"
17701770
},
17711771
"require": {
17721772
"automattic/jetpack-admin-ui": "^0.5.7-alpha",

0 commit comments

Comments
 (0)