Merge branch 'develop' into develop_new_ticket_files_links_in_actionc…

…omm_public_access
Dolibarr · Dec 18, 2024 · 34029c0 · 34029c0
2 parents f83fa9a + fcd294c
commit 34029c0
Show file tree

Hide file tree

Showing 147 changed files with 1,121 additions and 1,048 deletions.
diff --git a/.github/workflows/pr-18-autolabel.yaml b/.github/workflows/pr-18-autolabel.yaml
@@ -18,3 +18,4 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         configuration-path: .github/changed-lines-count-labeler.yml
+      continue-on-error: true
diff --git a/build/phpstan/bootstrap_action.php b/build/phpstan/bootstrap_action.php
@@ -27,6 +27,7 @@
 }
 
 // Defined some constants and load Dolibarr env to reduce PHPStan bootstrap that fails to load a lot of things.
+$dolibarr_main_document_root = __DIR__ . '/../../htdocs';
 define('DOL_DOCUMENT_ROOT', __DIR__ . '/../../htdocs');
 define('DOL_DATA_ROOT', __DIR__ . '/../../documents');
 define('DOL_URL_ROOT', '/');
@@ -42,6 +43,7 @@
  * @var User $user
  */
 
- global $conf, $db, $hookmanager, $langs, $mysoc, $user;
+global $conf, $db, $hookmanager, $langs, $mysoc, $user;
+global $dolibarr_main_document_root;
 
 // include_once DOL_DOCUMENT_ROOT . '/../../htdocs/main.inc.php';