Sync with upstream

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-**DynamicPageList3 version**:
+**DynamicPageList4 version**:
 **MediaWiki version**:
 **PHP version**:
 **Database version**:

.github/workflows/backport.yml

@@ -18,7 +18,7 @@ jobs:
       )
     steps:
       - name: Backport
-        uses: sqren/backport-github-action@v9.5.1
+        uses: sqren/backport-github-action@v10.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           auto_backport_label_prefix: backport-to-

.github/workflows/codacy.yml

@@ -30,12 +30,13 @@ jobs:
     permissions:
       contents: read # for actions/checkout to fetch code
       security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+
     name: Codacy Security Scan
     runs-on: ubuntu-latest
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
@@ -55,6 +56,7 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
+        continue-on-error: true
         with:
           sarif_file: results.sarif

.github/workflows/dependencies

@@ -1,3 +1,6 @@
+PageImages:
+  branch: auto
+  repo: auto
 Variables:
   branch: auto
   repo: auto

.github/workflows/mediawiki-tests.yml

@@ -13,73 +13,87 @@ jobs:
     strategy:
       matrix:
         include:
-          # Latest MediaWiki LTS - PHP 8.1 (phan)
-          - mw: 'REL1_43'
-            php: 8.1
-            php-docker: 81
+          # Legacy MediaWiki stable - PHP 8.2 (phan)
+          - mw: 'REL1_44'
+            php: 8.2
+            php-docker: 82
             experimental: false
             stage: phan
 
-          # Latest stable MediaWiki - PHP 8.1 (phan)
-          - mw: 'REL1_44'
-            php: 8.1
-            php-docker: 81
+          # Latest MediaWiki stable - PHP 8.2 (phan)
+          - mw: 'REL1_45'
+            php: 8.2
+            php-docker: 82
             experimental: true
             stage: phan
 
-          # Latest MediaWiki master - PHP 8.1 (phan)
+          # Latest MediaWiki stable - PHP 8.4 (phan)
+          - mw: 'REL1_45'
+            php: 8.4
+            php-docker: 84
+            experimental: true
+            stage: phan
+
+          # Latest MediaWiki master - PHP 8.2 (phan)
           - mw: 'master'
-            php: 8.1
-            php-docker: 81
+            php: 8.2
+            php-docker: 82
             experimental: true
             stage: phan
 
-          # Latest MediaWiki master - PHP 8.1 (coverage)
+          # Latest MediaWiki master - PHP 8.4 (phan)
           - mw: 'master'
-            php: 8.1
-            php-docker: 81
-            experimental: false
-            stage: coverage
+            php: 8.4
+            php-docker: 84
+            experimental: true
+            stage: phan
 
-          # Latest MediaWiki LTS - PHP 8.1 (phpunit)
-          - mw: 'REL1_43'
-            php: 8.1
-            php-docker: 81
-            experimental: false
-            stage: phpunit
+          # Latest MediaWiki master - PHP 8.2 (coverage)
+          - mw: 'master'
+            php: 8.2
+            php-docker: 82
+            experimental: true
+            stage: coverage
 
-          # Latest stable MediaWiki - PHP 8.1 (phpunit)
+          # Legacy MediaWiki stable - PHP 8.2 (phpunit)
           - mw: 'REL1_44'
-            php: 8.1
-            php-docker: 81
+            php: 8.2
+            php-docker: 82
             experimental: false
             stage: phpunit
 
-          # Latest MediaWiki master - PHP 8.1 (phpunit)
-          - mw: 'master'
-            php: 8.1
-            php-docker: 81
-            experimental: true
+          # Latest MediaWiki stable - PHP 8.2 (phpunit)
+          - mw: 'REL1_45'
+            php: 8.2
+            php-docker: 82
+            experimental: false
+            stage: phpunit
+
+          # Latest MediaWiki stable - PHP 8.4 (phpunit)
+          - mw: 'REL1_45'
+            php: 8.4
+            php-docker: 84
+            experimental: false
             stage: phpunit
 
-          # Latest MediaWiki master - PHP 8.1 (selenium)
+          # Latest MediaWiki master - PHP 8.2 (phpunit)
           - mw: 'master'
-            php: 8.1
-            php-docker: 81
+            php: 8.2
+            php-docker: 82
             experimental: true
-            stage: selenium
+            stage: phpunit
 
-          # Latest MediaWiki master - PHP 8.1 (qunit)
+          # Latest MediaWiki master - PHP 8.4 (phpunit)
           - mw: 'master'
-            php: 8.1
-            php-docker: 81
+            php: 8.4
+            php-docker: 84
             experimental: true
-            stage: qunit
+            stage: phpunit
 
-          # Latest stable MediaWiki - PHP 8.1 (composer-test)
-          - mw: 'REL1_43'
-            php: 8.1
-            php-docker: 81
+          # Latest MediaWiki stable - PHP 8.2 (composer-test)
+          - mw: 'REL1_45'
+            php: 8.2
+            php-docker: 82
             experimental: false
             stage: composer-test
 
@@ -89,17 +103,15 @@ jobs:
       DOCKER_REGISTRY: docker-registry.wikimedia.org
       DOCKER_ORG: releng
       QUIBBLE_DOCKER_IMAGE: quibble-bullseye-php${{ matrix.php-docker }}
-      COVERAGE_DOCKER_IMAGE: quibble-bullseye-php${{ matrix.php-docker }}-coverage
-      PHAN_DOCKER_IMAGE: mediawiki-phan-php${{ matrix.php-docker }}
       MEDIAWIKI_VERSION: ${{ matrix.mw }}
 
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.12.1
+        uses: styfle/cancel-workflow-action@0.13.0
         with:
           access_token: ${{ github.token }}
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       # /home/runner/cache/                               Cache
       # /home/runner/src/                                 Mediawiki installation
@@ -109,13 +121,7 @@ jobs:
       # $GITHUB_WORKSPACE/.github/workflows/globals.php   Add global configuration options for MediaWiki
       - name: Set up
         run: |
-          if [ "${{ matrix.stage }}" == 'phan' ]; then
-            export DOCKER_IMAGE="${PHAN_DOCKER_IMAGE}"
-          elif [ "${{ matrix.stage }}" == coverage ]; then
-            export DOCKER_IMAGE="${COVERAGE_DOCKER_IMAGE}"
-          else
-            export DOCKER_IMAGE="${QUIBBLE_DOCKER_IMAGE}"
-          fi
+          export DOCKER_IMAGE="${QUIBBLE_DOCKER_IMAGE}"
           echo "DOCKER_IMAGE=${DOCKER_IMAGE}" >> $GITHUB_ENV
 
           # Get the latest docker tag (Ref: https://github.com/thcipriani/dockerregistry)
@@ -142,7 +148,7 @@ jobs:
           fi
 
       - name: Cache docker image
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: /home/runner/docker-images/${{ env.DOCKER_IMAGE }}
           key: ${{ env.DOCKER_IMAGE }}:${{ env.DOCKER_LATEST_TAG }}
@@ -154,7 +160,7 @@ jobs:
 
       - name: Cache quibble docker image
         if: ${{ matrix.stage == 'coverage' || matrix.stage == 'phan' }}
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: /home/runner/docker-images/${{ env.QUIBBLE_DOCKER_IMAGE }}
           key: ${{ env.QUIBBLE_DOCKER_IMAGE }}:${{ env.QUIBBLE_DOCKER_LATEST_TAG }}
@@ -190,7 +196,7 @@ jobs:
           git -C src/ log -n 1 --format="%H"
 
       - name: Cache dependencies (composer and npm)
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: /home/runner/cache
           key: ${{ runner.os }}-${{ env.MEDIAWIKI_VERSION }}-${{ hashFiles('**/*.json') }}
@@ -259,6 +265,7 @@ jobs:
 
           if [ "${{ matrix.stage }}" == 'phan' ]; then
             docker run \
+              --entrypoint /run-phan.sh \
               -e THING_SUBNAME=extensions/"${{ github.event.repository.name }}" \
               -v "$(pwd)"/src:/mediawiki \
               "${DOCKER_REGISTRY}/${DOCKER_ORG}/${DOCKER_IMAGE}:${DOCKER_LATEST_TAG}" \
@@ -272,8 +279,15 @@ jobs:
               -v "$(pwd)"/cover:/workspace/cover \
               "${DOCKER_REGISTRY}/${DOCKER_ORG}/${DOCKER_IMAGE}:${DOCKER_LATEST_TAG}" \
               --skip-zuul \
-              --skip-deps \
-              -c mwext-phpunit-coverage
+              --packages-source composer \
+              -c "/bin/bash -c 'curl -sL https://raw.githubusercontent.com/wikimedia/integration-config/refs/heads/master/dockerfiles/quibble-bullseye-php81-coverage/mwext-phpunit-coverage.sh -o mwext-phpunit-coverage && \
+                curl -sL https://raw.githubusercontent.com/wikimedia/integration-config/refs/heads/master/dockerfiles/quibble-bullseye-php81-coverage/phpunit-suite-edit.py -o phpunit-suite-edit && \
+                curl -sL https://raw.githubusercontent.com/wikimedia/integration-config/refs/heads/master/dockerfiles/quibble-bullseye-php81-coverage/phpunit-junit-edit.py -o phpunit-junit-edit && \
+                rm -rf /workspace/src/extensions/*/vendor/squizlabs/php_codesniffer /workspace/src/extensions/*/vendor/composer/pcre && \
+                chmod +x mwext-phpunit-coverage phpunit-suite-edit phpunit-junit-edit && \
+                sed -i \"s|phpunit-suite-edit|./phpunit-suite-edit|g\" mwext-phpunit-coverage && \
+                sed -i \"s|phpunit-junit-edit|./phpunit-junit-edit|g\" mwext-phpunit-coverage && \
+                ./mwext-phpunit-coverage'"
           elif [ "${{ matrix.stage }}" != 'coverage' ]; then
             docker run \
               --entrypoint quibble-with-supervisord \

.phan/config.php

@@ -2,23 +2,61 @@
 
 $cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';
 
-$cfg['minimum_target_php_version'] = '8.1';
-
 $cfg['directory_list'] = array_merge(
 	$cfg['directory_list'], [
+		'../../extensions/PageImages',
 		'../../extensions/Variables',
 	]
 );
 
 $cfg['exclude_analysis_directory_list'] = array_merge(
 	$cfg['exclude_analysis_directory_list'], [
+		'../../extensions/PageImages',
 		'../../extensions/Variables',
 	]
 );
 
 $cfg['suppress_issue_types'] = [
 	'SecurityCheck-LikelyFalsePositive',
 	'PhanAccessMethodInternal',
+	'PhanPluginMixedKeyNoKey',
 ];
 
+$cfg['plugins'] = array_merge( $cfg['plugins'], [
+	'AddNeverReturnTypePlugin',
+	'AlwaysReturnPlugin',
+	'DeprecateAliasPlugin',
+	'DollarDollarPlugin',
+	'DuplicateConstantPlugin',
+	'EmptyMethodAndFunctionPlugin',
+	'EmptyStatementListPlugin',
+	'FFIAnalysisPlugin',
+	'InlineHTMLPlugin',
+	'InvalidVariableIssetPlugin',
+	'InvokePHPNativeSyntaxCheckPlugin',
+	'LoopVariableReusePlugin',
+	'NotFullyQualifiedUsagePlugin',
+	'PHPDocRedundantPlugin',
+	'PHPUnitAssertionPlugin',
+	'PHPUnitNotDeadCodePlugin',
+	'PreferNamespaceUsePlugin',
+	'RedundantAssignmentPlugin',
+	'SimplifyExpressionPlugin',
+	'SleepCheckerPlugin',
+	'StrictComparisonPlugin',
+	'StrictLiteralComparisonPlugin',
+	'SuspiciousParamOrderPlugin',
+	'UnreachableCodePlugin',
+	'UnsafeCodePlugin',
+	'UseReturnValuePlugin',
+] );
+
+$cfg['analyze_signature_compatibility'] = true;
+$cfg['enable_class_alias_support'] = true;
+$cfg['enable_extended_internal_return_type_plugins'] = true;
+$cfg['error_prone_truthy_condition_detection'] = true;
+$cfg['redundant_condition_detection'] = true;
+$cfg['unused_variable_detection'] = true;
+$cfg['warn_about_relative_include_statement'] = true;
+
 return $cfg;

.phpcs.xml

@@ -1,11 +1,25 @@
 <?xml version="1.0"?>
 <ruleset>
 	<file>.</file>
-	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
-		<exclude name="PSR2.Methods.MethodDeclaration.Underscore" />
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
+		<severity>5</severity>
 	</rule>
-	<arg name="bootstrap" value="./vendor/mediawiki/mediawiki-codesniffer/utils/bootstrap-ci.php"/>
-	<arg name="extensions" value="php"/>
-	<arg name="encoding" value="UTF-8"/>
+	<rule ref="Squiz.WhiteSpace.FunctionSpacing.BeforeFirst">
+		<severity>5</severity>
+	</rule>
+	<rule ref="Squiz.WhiteSpace.MemberVarSpacing.FirstIncorrect">
+		<severity>5</severity>
+	</rule>
+	<rule ref="MediaWiki.Classes.FullQualifiedClassName">
+		<severity>5</severity>
+		<properties>
+			<property name="allowMainNamespace" value="false" />
+			<property name="allowInheritance" value="false" />
+			<property name="allowFunctions" value="false" />
+		</properties>
+	</rule>
+	<arg name="bootstrap" value="./vendor/mediawiki/mediawiki-codesniffer/utils/bootstrap-ci.php" />
+	<arg name="extensions" value="php" />
+	<arg name="encoding" value="UTF-8" />
 </ruleset>