Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qual: "Backport phan to 18.0" prepare develop branch #30616

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fbfef0b
Backport phan
mdeweerd Aug 12, 2024
0c9dd45
Merge branch 'backport/phan/18' into backport/phan/19
mdeweerd Aug 12, 2024
224d76f
Setup baseline for V19
mdeweerd Aug 12, 2024
ff40527
Merge branch 'backport/phan/19' into backport/phan/20
mdeweerd Aug 12, 2024
9904b9e
Update phan baseline
mdeweerd Aug 12, 2024
b033c5e
Merge branch 'backport/phan/20' into backport/phan/develop
mdeweerd Aug 12, 2024
1bbccce
Correct baseline
mdeweerd Aug 13, 2024
8c733b8
Merge branch 'backport/phan/18' into backport/phan/19
mdeweerd Aug 13, 2024
e1e9e2e
Merge branch 'backport/phan/19' into backport/phan/20
mdeweerd Aug 13, 2024
44783a5
Merge branch 'backport/phan/20' into backport/phan/develop
mdeweerd Aug 13, 2024
6d6b26b
fix display date update of supplier price (#30619)
frederic34 Aug 13, 2024
c0f215f
Adjust codespell exceptions
mdeweerd Aug 13, 2024
342b3a2
Merge branch 'backport/phan/19' into backport/phan/20
mdeweerd Aug 13, 2024
f93b4b8
Ignore spelling exception
mdeweerd Aug 13, 2024
7c19024
Merge branch 'backport/phan/19' into backport/phan/20
mdeweerd Aug 13, 2024
c2aa58a
Merge branch 'backport/phan/20' into backport/phan/develop
mdeweerd Aug 13, 2024
e06eacb
Merge branch '19.0' into backport/phan/19
mdeweerd Aug 13, 2024
f49e706
Merge branch 'develop' into backport/phan/develop
mdeweerd Aug 13, 2024
8ee4b75
Merge branch 'backport/phan/19' into backport/phan/develop
mdeweerd Aug 13, 2024
c2cbdfc
Qual: .github workflow must exist when included
mdeweerd Aug 13, 2024
cd57d83
Merge branch 'backport/phan/18' into backport/phan/19
mdeweerd Aug 13, 2024
e5358cc
Update baseline
mdeweerd Aug 13, 2024
55ee2c6
Merge branch 'backport/phan/19' into backport/phan/develop
mdeweerd Aug 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]"
1 change: 1 addition & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,4 @@ jobs:
path: |
${{ env.RAW_LOG }}
${{ env.CS_XML }}
retention-days: 2
15 changes: 14 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ repos:
# Remove trailing whitespace
- id: trailing-whitespace
exclude_types: [markdown]
exclude: |
(?x)^(dev/tools/codespell/codespell-lines-ignore.txt)$
# Fix the end of file
- id: end-of-file-fixer
# Check that there are no completely merged file conflicts
Expand Down Expand Up @@ -227,7 +229,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-ignores -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.10.0.1
Expand Down
2 changes: 1 addition & 1 deletion dev/tools/phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,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"],
Expand Down
2 changes: 1 addition & 1 deletion htdocs/product/price_suppliers.php
Original file line number Diff line number Diff line change
Expand Up @@ -1258,7 +1258,7 @@ function edit_price_from_multicurrency() {
// Date modification
if (!empty($arrayfields['pfp.tms']['checked'])) {
print '<td class="right nowraponall">';
print dol_print_date(($productfourn->fourn_date_modification ? $productfourn->fourn_date_modification : $productfourn->date_modification), "dayhour");
print dol_print_date(($productfourn->fourn_date_modification ? $productfourn->fourn_date_modification : $productfourn->date_modification), 'dayhour', 'tzuserrel');
print '</td>';
}

Expand Down
Loading