Skip to content

Commit 1af455d

Browse files
Jazz-ManJazz-Man
committed
Merge branch 'release/3.5.1'
2 parents bc5e2ed + af29ec3 commit 1af455d

File tree

5 files changed

+47
-11
lines changed

5 files changed

+47
-11
lines changed

‎.github/workflows/reviewdog.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Setup PHP, with composer and extensions
2323
uses: shivammathur/setup-php@v2
2424
with:
25-
php-version: 8.2
25+
php-version: 8.4
2626
coverage: none
27-
tools: phpmd, psalm, phpstan
27+
tools: psalm
2828

2929
- name: Get composer cache directory
3030
id: composer-cache
3131
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
3232

3333
- name: Cache composer dependencies
34-
uses: actions/cache@v3
34+
uses: actions/cache@v4
3535
with:
3636
path: ${{ steps.composer-cache.outputs.dir }}
3737
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -48,4 +48,4 @@ jobs:
4848
- name: Reviewdog GitHub Check
4949
env:
5050
REVIEWDOG_GITHUB_API_TOKEN: ${{ github.token }}
51-
run: reviewdog -reporter=github-check -filter-mode=nofilter -fail-on-error
51+
run: reviewdog -reporter=github-check -filter-mode=nofilter -fail-on-error

‎.reviewdog.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
runner:
22
phpmd:
3-
cmd: phpmd . checkstyle phpmd.ruleset.xml --exclude 'cache/*,vendor/*' --baseline-file phpmd.baseline.xml
3+
cmd: vendor/bin/phpmd . checkstyle phpmd.ruleset.xml --exclude 'cache/*,vendor/*' --baseline-file phpmd.baseline.xml
44
name: phpmd
55
format: checkstyle
66
level: warning
77

88
phpstan:
9-
cmd: phpstan --error-format=checkstyle
9+
cmd: vendor/bin/phpstan --error-format=checkstyle
1010
format: checkstyle
1111
name: phpstan
1212
level: warning
@@ -15,4 +15,4 @@ runner:
1515
cmd: psalm --config=psalm.xml --no-progress --use-baseline=psalm-baseline.xml --output-format=checkstyle
1616
format: checkstyle
1717
name: psalm
18-
level: warning
18+
level: warning

‎composer.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"classmap-authoritative": true,
1717
"apcu-autoloader": true,
1818
"allow-plugins": {
19-
"roots/wordpress-core-installer": true,
19+
"composer/installers": true,
2020
"phpstan/extension-installer": true,
21-
"composer/installers": true
21+
"roots/wordpress-core-installer": true
2222
}
2323
},
2424
"require": {
@@ -31,7 +31,9 @@
3131
"require-dev": {
3232
"jazzman/php-cs-fixer-rules": "^0.2.1",
3333
"jetbrains/phpstorm-attributes": "^1.2",
34+
"pdepend/pdepend": "3.x-dev",
3435
"php-stubs/wordpress-stubs": "^6.7",
36+
"phpmd/phpmd": "3.x-dev",
3537
"phpstan/extension-installer": "^1.4",
3638
"rector/rector": "^1.2",
3739
"roave/security-advisories": "@dev",

‎phpmd.baseline.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,52 @@
11
<?xml version="1.0"?>
22
<phpmd-baseline>
3+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/CleanUp.php" method="protectXmlrpc"/>
34
<violation rule="PHPMD\Rule\CyclomaticComplexity" file="src/Optimization/CleanUp.php" method="protectXmlrpc"/>
45
<violation rule="PHPMD\Rule\Design\NpathComplexity" file="src/Optimization/CleanUp.php" method="protectXmlrpc"/>
6+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/CleanUp.php" method="cleanupWpHead"/>
7+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/Enqueue.php" method="jsToFooter"/>
8+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/Enqueue.php" method="prepareScriptFilePath"/>
9+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/Enqueue.php" method="fixMultiSitePath"/>
10+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/LastPostModified.php" method="isLocked"/>
11+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/LastPostModified.php" method="getLockName"/>
12+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/LastPostModified.php" method="bumpLastPostModified"/>
13+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/LastPostModified.php" method="getOptionName"/>
14+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/LastPostModified.php" method="getLastPostModified"/>
515
<violation rule="PHPMD\Rule\Design\WeightedMethodCount" file="src/Optimization/Media.php"/>
616
<violation rule="PHPMD\Rule\Design\NpathComplexity" file="src/Optimization/Media.php" method="resizeImageOnTheFly"/>
17+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/Media.php" method="prepareSvgImageData"/>
718
<violation rule="PHPMD\Rule\CyclomaticComplexity" file="src/Optimization/Media.php" method="prepareSvgImageData"/>
819
<violation rule="PHPMD\Rule\Design\NpathComplexity" file="src/Optimization/Media.php" method="prepareSvgImageData"/>
20+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/Media.php" method="getXmlProperty"/>
21+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/Media.php" method="getSvgXmlSize"/>
22+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/Media.php" method="isImageSizesExist"/>
23+
<violation rule="PHPMD\Rule\UnusedPrivateField" file="src/Optimization/TermCount.php"/>
24+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/TermCount.php" method="handleTermRelationshipChange"/>
925
<violation rule="PHPMD\Rule\CleanCode\ElseExpression" file="src/Optimization/TermCount.php"/>
26+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/TermCount.php" method="quickUpdateTermsCount"/>
1027
<violation rule="PHPMD\Rule\CyclomaticComplexity" file="src/Optimization/TermCount.php" method="quickUpdateTermsCount"/>
1128
<violation rule="PHPMD\Rule\Design\NpathComplexity" file="src/Optimization/TermCount.php" method="quickUpdateTermsCount"/>
29+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/TermCount.php" method="transitionType"/>
1230
<violation rule="PHPMD\Rule\Design\TooManyPublicMethods" file="src/Optimization/Update.php"/>
1331
<violation rule="PHPMD\Rule\Naming\LongVariable" file="src/Optimization/Update.php"/>
32+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/Update.php" method="preSiteTransientUpdateThemes"/>
33+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/Update.php" method="preSiteTransientUpdatePlugins"/>
34+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/Update.php" method="coreBlockerGetLanguages"/>
35+
<violation rule="PHPMD\Rule\UnusedPrivateField" file="src/Optimization/WPQuery.php"/>
36+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/WPQuery.php" method="invalidateFoundPostsCache"/>
37+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/WPQuery.php" method="getInvalidateTime"/>
38+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/WPQuery.php" method="getTimeFoundPosts"/>
39+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/WPQuery.php" method="generateFoundPostCacheKey"/>
40+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/WPQuery.php" method="getFoundPostsCache"/>
41+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Optimization/WPQuery.php" method="setFoundPostsCache"/>
1442
<violation rule="PHPMD\Rule\Design\WeightedMethodCount" file="src/Utils/AttachmentData.php"/>
43+
<violation rule="PHPMD\Rule\UnusedPrivateField" file="src/Utils/AttachmentData.php"/>
44+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Utils/AttachmentData.php" method="readImgMetadata"/>
45+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Utils/AttachmentData.php" method="getAttachmentFromDb"/>
46+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Utils/AttachmentData.php" method="getAttachmentSizes"/>
47+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Utils/AttachmentData.php" method="getSizeArray"/>
48+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Utils/AttachmentData.php" method="getImageSrcset"/>
49+
<violation rule="PHPMD\Rule\UnusedPrivateMethod" file="src/Utils/AttachmentData.php" method="calculateImageSecretSources"/>
1550
<violation rule="PHPMD\Rule\CyclomaticComplexity" file="src/Utils/AttachmentData.php" method="calculateImageSecretSources"/>
1651
<violation rule="PHPMD\Rule\Design\NpathComplexity" file="src/Utils/AttachmentData.php" method="calculateImageSecretSources"/>
1752
<violation rule="PHPMD\Rule\CleanCode\ElseExpression" file="src/Utils/AttachmentData.php"/>

‎psalm.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xmlns="https://getpsalm.org/schema/config"
44
xsi:schemaLocation="https://getpsalm.org/schema/config"
5-
serializer="igbinary"
65
errorBaseline="psalm-baseline.xml"
76
errorLevel="1"
87
phpVersion="8.2"

0 commit comments

Comments
 (0)