Merge branch 'backport/phan/19' into backport/phan/20

.github/workflows/ci.yml

@@ -35,6 +35,6 @@ jobs:
 
 
 # Note (not tested, from https://github.com/orgs/community/discussions/38361)
-# To cancel jobs if one failes, the following action may help
+# To cancel jobs if one fails, the following action may help
 #       - if: "failure()"
 #        uses: "andymckay/[email protected]"

.pre-commit-config.yaml

@@ -227,7 +227,18 @@ repos:
           - dev/tools/codespell/codespell-lines-ignore.txt
           - --uri-ignore-words-list
           - ned
-
+      - alias: codespell-ignores
+        #
+        # Update codespell ignore file.
+        #
+        # Execute with `pre-commit run codespell -a --hook-stage manual`
+        id: codespell
+        stages: [manual]
+        name: Update file with codespell exceptions
+        additional_dependencies: [tomli]
+        language: python
+        entry: bash -c '[ ! -x dev/tools/codespell/addCodespellIgnores.sh ] || dev/tools/codespell/addCodespellIgnores.sh'
+        pass_filenames: false
   # Check some shell scripts
   - repo: https://github.com/shellcheck-py/shellcheck-py
     rev: v0.9.0.6

dev/tools/codespell/codespell-ignore.txt

@@ -68,7 +68,6 @@ unvalidate
 
 # Some french strings
 somme
-caracteres
 cas
 sur
 Datas
@@ -81,3 +80,6 @@ fonction
 espace
 methode
 datee
+
+# other
+blacklists

dev/tools/phan/config.php

@@ -350,7 +350,7 @@
 		'/^GETPOST$/' => [1, $sanitizeRegex, 'GetPostUnknownSanitizeType'],
 		'/^isModEnabled$/' => [0, $moduleNameRegex, 'UnknownModuleName'],
 		// Note: trick to have different key for same regex:
-		'/^isModEnable[d]$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
+		// '/^isModEnable[d]$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
 		'/^sanitizeVal$/' => [1, $sanitizeRegex,"UnknownSanitizeType"],
 		'/^checkVal$/' => [1, $sanitizeRegex,"UnknownCheckValSanitizeType"],
 		'/^\\\\ExtraFields::addExtraField$/' => [2, $extraFieldTypeRegex,"UnknownExtrafieldTypeBack"],