Skip to content

Commit

Permalink
Merge branch 'develop' into patch-10
Browse files Browse the repository at this point in the history
  • Loading branch information
frederic34 authored Nov 5, 2024
2 parents ed1cb9f + 24e7285 commit 75c2aca
Show file tree
Hide file tree
Showing 1,213 changed files with 44,840 additions and 1,362 deletions.
27 changes: 26 additions & 1 deletion build/phpstan/bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
<?php
/* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

// Defined some constants and load Dolibarr env to reduce PHPStan bootstrap that fails to load a lot of things.
//define('DOL_DOCUMENT_ROOT', __DIR__ . '/../../htdocs');
Expand All @@ -16,5 +31,15 @@
define("NOHTTPSREDIRECT", '1');
}

global $conf, $db, $langs, $user;
/**
* @var Conf $conf
* @var DoliDB $db
* @var HookManager $hookmanager
* @var Societe $mysoc
* @var Translate $langs
* @var User $user
*/

global $conf, $db, $hookmanager, $langs, $mysoc, $user;

include_once __DIR__ . '/../../htdocs/main.inc.php';
27 changes: 26 additions & 1 deletion build/phpstan/bootstrap_action.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
<?php
/* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

// Load the main.inc.php file to have functions env defined
if (!defined("NOLOGIN")) {
Expand All @@ -18,5 +33,15 @@
define('DOL_MAIN_URL_ROOT', '/');
define('MAIN_DB_PREFIX', 'llx_');

global $conf, $db, $langs, $user;
/**
* @var Conf $conf
* @var DoliDB $db
* @var HookManager $hookmanager
* @var Societe $mysoc
* @var Translate $langs
* @var User $user
*/

global $conf, $db, $hookmanager, $langs, $mysoc, $user;

// include_once DOL_DOCUMENT_ROOT . '/../../htdocs/main.inc.php';
Loading

0 comments on commit 75c2aca

Please sign in to comment.