Merge branch '18.0' of [email protected]:Dolibarr/dolibarr.git into 19.0

atm-maxime · Jan 5, 2025 · 757d1b2 · 757d1b2
2 parents 86a6322 + eb4e059
commit 757d1b2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/pr-18.yaml b/.github/workflows/pr-18.yaml
@@ -32,7 +32,7 @@ jobs:
       run: |
         gh pr edit "$url" --add-assignee rycks --add-reviewer rycks
         gh pr merge "$url" --merge --auto
-
+      continue-on-error: true
 
     - name: Assign reviewer method 2
       env:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -3,8 +3,7 @@ on:
   workflow_dispatch:
   pull_request:
     types: [opened, reopened, synchronize]
-    branches:
-      - "18.0"
+  push:
 
 env:
   ENVGHT: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -87,6 +87,8 @@ repos:
           ]
         pass_filenames: false # Run on all files
       - id: php-lint
+        exclude:
+          (?x)^(htdocs/includes/symfony/var-dumper/Tests/.*)$
       - id: php-stan
         stages: [manual]
         files: \.(php)$

diff --git a/htdocs/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php b/htdocs/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php
@@ -878,7 +878,7 @@ protected function getCompaction($mode, $code, $addmode=true) {
 				$txtarr = array(); // array of characters and sub-mode switching characters
 				$codelen = strlen($code);
 				for ($i = 0; $i < $codelen; ++$i) {
-					$chval = ord($code{$i});
+					$chval = ord($code[$i]);
 					if (($k = array_search($chval, $this->textsubmodes[$submode])) !== false) {
 						// we are on the same sub-mode
 						$txtarr[] = $k;
@@ -888,7 +888,7 @@ protected function getCompaction($mode, $code, $addmode=true) {
 							// search new sub-mode
 							if (($s != $submode) AND (($k = array_search($chval, $this->textsubmodes[$s])) !== false)) {
 								// $s is the new submode
-								if (((($i + 1) == $codelen) OR ((($i + 1) < $codelen) AND (array_search(ord($code{($i + 1)}), $this->textsubmodes[$submode]) !== false))) AND (($s == 3) OR (($s == 0) AND ($submode == 1)))) {
+								if (((($i + 1) == $codelen) OR ((($i + 1) < $codelen) AND (array_search(ord($code[($i + 1)]), $this->textsubmodes[$submode]) !== false))) AND (($s == 3) OR (($s == 0) AND ($submode == 1)))) {
 									// shift (temporary change only for this char)
 									if ($s == 3) {
 										// shift to puntuaction
@@ -952,7 +952,7 @@ protected function getCompaction($mode, $code, $addmode=true) {
 						$cw = array_merge($cw, $cw6);
 					} else {
 						for ($i = 0; $i < $sublen; ++$i) {
-							$cw[] = ord($code{$i});
+							$cw[] = ord($code[$i]);
 						}
 					}
 					$code = $rest;