Remove specific AJAX handling based on manual declarations

cedric-anne · trasher · commit d9acbd01a240 · 2025-02-10T10:47:39.000+01:00
diff --git a/.phpstan-baseline.php b/.phpstan-baseline.php
@@ -2305,12 +2305,6 @@
 	'count' => 2,
 	'path' => __DIR__ . '/src/Glpi/Controller/ApiController.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method Glpi\\\\Controller\\\\LegacyFileLoadController\\:\\:getRequest\\(\\) never returns null so it can be removed from the return type\\.$#',
-	'identifier' => 'return.unusedType',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Glpi/Controller/LegacyFileLoadController.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#',
 	'identifier' => 'nullCoalesce.expr',
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -233,7 +233,6 @@ The present file will list all changes made to the project; according to the
 - Usage of the `/marketplace` path for plugins URLs. All plugins URLs should now start with `/plugins`.
 - Usage of `GLPI_PLUGINS_PATH` javascript variable.
 - Usage of `MAIL_SMTPSSL` and `MAIL_SMTPTLS` constants.
-- `$AJAX_INCLUDE` global variable usage. Use `$this->setAjax()` in legacy `/ajax/` and `/front` scripts or `Html::setAjax()` and `Session::setAjax()`.
 - Usage of `name` and `users_id_validate` parameter in `ajax/dropdownValidator.php`.
 - Usage of `users_id_validate` parameter in `front/commonitilvalidation.form.php`.
 - `front/ticket_ticket.form.php` script usage.
@@ -307,6 +306,7 @@ The present file will list all changes made to the project; according to the
 - `GLPI_DEMO_MODE` constant.
 - `GLPI_DUMP_DIR` constant.
 - `GLPI_SQL_DEBUG` constant.
+- `$AJAX_INCLUDE` global variable.
 - `$CFG_GLPI_PLUGINS` global variable.
 - `$DBCONNECTION_REQUIRED` and `$USEDBREPLICATE` global variables. Use `DBConnection::getReadConnection()` to get the most apporpriate connection for read only operations.
 - `$dont_check_maintenance_mode` and `$skip_db_check` global variables.
diff --git a/ajax/2fa.php b/ajax/2fa.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 if (isset($_POST['regenerate_backup_codes'])) {
     $totp = new \Glpi\Security\TOTPManager();
     $codes = $totp->regenerateBackupCodes(Session::getLoginUserID());
diff --git a/ajax/actorinformation.php b/ajax/actorinformation.php
@@ -33,8 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/actors.php b/ajax/actors.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 switch ($_REQUEST['action']) {
     case "getActors":
         header("Content-Type: application/json; charset=UTF-8");
diff --git a/ajax/agent.php b/ajax/agent.php
@@ -36,9 +36,6 @@
 use Glpi\Exception\Http\AccessDeniedHttpException;
 use Glpi\Exception\Http\NotFoundHttpException;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: application/json; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/asset/assetdefinition.php b/ajax/asset/assetdefinition.php
@@ -37,9 +37,6 @@
 use Glpi\Exception\Http\BadRequestHttpException;
 use Glpi\Exception\Http\NotFoundHttpException;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 Session::checkRight(AssetDefinition::$rightname, READ);
 Session::writeClose();
 
diff --git a/ajax/asset/customfield.php b/ajax/asset/customfield.php
@@ -35,9 +35,6 @@
 use Glpi\Asset\CustomFieldDefinition;
 use Glpi\Exception\Http\BadRequestHttpException;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 Session::checkRight(CustomFieldDefinition::$rightname, READ);
 
 if (isset($_POST['action'])) {
diff --git a/ajax/central.php b/ajax/central.php
@@ -35,10 +35,6 @@
 
 use Glpi\Exception\Http\BadRequestHttpException;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-
-$this->setAjax();
-
 // Send UTF8 Headers
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
diff --git a/ajax/comments.php b/ajax/comments.php
@@ -38,9 +38,6 @@
  */
 global $CFG_GLPI;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 // Send UTF8 Headers
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
diff --git a/ajax/common.tabs.php b/ajax/common.tabs.php
@@ -38,9 +38,6 @@
  */
 global $CFG_GLPI;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/commonitilsatisfaction.php b/ajax/commonitilsatisfaction.php
@@ -36,9 +36,6 @@
 use Glpi\Application\View\TemplateRenderer;
 use Glpi\Exception\Http\AccessDeniedHttpException;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/displayMessageAfterRedirect.php b/ajax/displayMessageAfterRedirect.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 Html::header_nocache();
 
 if (isset($_GET['get_raw']) && filter_var(($_GET['display_container'] ?? true), FILTER_VALIDATE_BOOLEAN)) {
diff --git a/ajax/dropdownConnectNetworkPort.php b/ajax/dropdownConnectNetworkPort.php
@@ -44,9 +44,6 @@
  */
 global $DB;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/dropdownInstallVersion.php b/ajax/dropdownInstallVersion.php
@@ -38,9 +38,6 @@
  */
 global $DB;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/dropdownMassiveActionAddActor.php b/ajax/dropdownMassiveActionAddActor.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/dropdownMassiveActionAddValidator.php b/ajax/dropdownMassiveActionAddValidator.php
@@ -42,9 +42,6 @@
  */
 global $CFG_GLPI;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/dropdownMassiveActionAuthMethods.php b/ajax/dropdownMassiveActionAuthMethods.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/dropdownRubDocument.php b/ajax/dropdownRubDocument.php
@@ -38,9 +38,6 @@
  */
 global $DB;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/dropdownSoftwareLicense.php b/ajax/dropdownSoftwareLicense.php
@@ -38,9 +38,6 @@
  */
 global $DB;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/dropdownValidator.php b/ajax/dropdownValidator.php
@@ -42,9 +42,6 @@
  */
 global $CFG_GLPI;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/entitytreesons.php b/ajax/entitytreesons.php
@@ -39,9 +39,6 @@
  */
 global $CFG_GLPI, $GLPI_CACHE;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: application/json; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/fuzzysearch.php b/ajax/fuzzysearch.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: application/json; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/genericdate.php b/ajax/genericdate.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 // Send UTF8 Headers
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
diff --git a/ajax/getDropdownUsers.php b/ajax/getDropdownUsers.php
@@ -37,9 +37,6 @@
  * @since 0.85
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: application/json; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/getFileTag.php b/ajax/getFileTag.php
@@ -37,9 +37,6 @@
  * @since 0.85
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header('Content-type: application/json; charset=UTF-8');
 Html::header_nocache();
 
diff --git a/ajax/getUserPicture.php b/ajax/getUserPicture.php
@@ -35,9 +35,6 @@
 
 use Glpi\Exception\Http\BadRequestHttpException;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: application/json; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/impact.php b/ajax/impact.php
@@ -41,9 +41,6 @@
 const DELTA_ACTION_UPDATE = 2;
 const DELTA_ACTION_DELETE = 3;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 /**
  * @var array $CFG_GLPI
  */
diff --git a/ajax/itilfollowup.php b/ajax/itilfollowup.php
@@ -39,9 +39,6 @@
 
 use Glpi\Exception\Http\BadRequestHttpException;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: application/json; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/itilvalidation.php b/ajax/itilvalidation.php
@@ -39,9 +39,6 @@
 
 use Glpi\Exception\Http\BadRequestHttpException;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: application/json; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/kanban.php b/ajax/kanban.php
@@ -40,9 +40,6 @@
 use Glpi\Features\Kanban;
 use Glpi\Features\Teamwork;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/mailcollector.php b/ajax/mailcollector.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 // Send UTF8 Headers
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
diff --git a/ajax/notificationmailingsettings.php b/ajax/notificationmailingsettings.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 Session::checkRight("config", UPDATE);
 
 if (isset($_POST["test_smtp_send"])) {
diff --git a/ajax/planningend.php b/ajax/planningend.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 // Send UTF8 Headers
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
diff --git a/ajax/projecttask.php b/ajax/projecttask.php
@@ -37,9 +37,6 @@
  * @since 9.2
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 header("Content-Type: application/json; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/rack.php b/ajax/rack.php
@@ -36,10 +36,6 @@
 use Glpi\Exception\Http\AccessDeniedHttpException;
 use Glpi\Exception\Http\BadRequestHttpException;
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-
-$this->setAjax();
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
diff --git a/ajax/resaperiod.php b/ajax/resaperiod.php
@@ -37,9 +37,6 @@
  * @since 0.84
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 // Send UTF8 Headers
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
diff --git a/ajax/rule.php b/ajax/rule.php
@@ -33,9 +33,6 @@
  * ---------------------------------------------------------------------
  */
 
-/** @var \Glpi\Controller\LegacyFileLoadController $this */
-$this->setAjax();
-
 switch ($_REQUEST['action']) {
     case "move_rule":
         $rule_collection = getItemForItemtype($_POST['collection_classname']);
diff --git a/ajax/search.php b/ajax/search.php
diff --git a/ajax/solution.php b/ajax/solution.php
diff --git a/ajax/subvisibility.php b/ajax/subvisibility.php
diff --git a/ajax/task.php b/ajax/task.php
diff --git a/ajax/ticketiteminformation.php b/ajax/ticketiteminformation.php
diff --git a/ajax/uemailUpdate.php b/ajax/uemailUpdate.php
diff --git a/ajax/unlockobject.php b/ajax/unlockobject.php
diff --git a/ajax/visibility.php b/ajax/visibility.php
diff --git a/front/dropdown.common.form.php b/front/dropdown.common.form.php
diff --git a/front/reservation.form.php b/front/reservation.form.php
diff --git a/inc/includes.php b/inc/includes.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
diff --git a/src/Glpi/Controller/LegacyFileLoadController.php b/src/Glpi/Controller/LegacyFileLoadController.php
diff --git a/src/Glpi/Http/Listener/LegacyPostRequestActionsListener.php b/src/Glpi/Http/Listener/LegacyPostRequestActionsListener.php
diff --git a/src/Glpi/Kernel/Kernel.php b/src/Glpi/Kernel/Kernel.php
diff --git a/src/Session.php b/src/Session.php
