post rebase fix (lint)

Author: SebSept

install/migrations/update_11.0.x_to_11.1.0/ola.php

@@ -122,8 +122,8 @@ function migrate_items_olas_data(Migration $migration): void
         // olas_id_tto field is removed : considere migration as done
         return;
     }
-    $tickets_with_ola = $_ticket->find(['OR' =>
-        [
+    $tickets_with_ola = $_ticket->find(['OR'
+        => [
             ['NOT' => ['olas_id_tto' => null]],
             ['NOT' => ['olas_id_ttr' => null]],
         ]]);

src/Glpi/Search/Provider/SQLProvider.php

@@ -5813,7 +5813,7 @@ public static function giveItem(
                 case "glpi_tickets.time_to_own":
                     // Due date + progress
                     if (in_array($orig_id, [151, 158, 181])) {
-                        $out = htmlescape(\Html::convDateTime($data[$ID][0]['name']));
+                        $out = htmlescape(Html::convDateTime($data[$ID][0]['name']));
 
                         $color = null;
                         if (
@@ -6053,7 +6053,7 @@ public static function giveItem(
                                 ($ticket_status == Ticket::SOLVED)
                                 || ($ticket_status == Ticket::CLOSED)
                             ) {
-                                $out .= $ola_name . ' : ' . htmlescape(\Html::convDateTime($due_time)) . '</br>';
+                                $out .= $ola_name . ' : ' . htmlescape(Html::convDateTime($due_time)) . '</br>';
                                 continue;
                             }
 
@@ -6067,7 +6067,7 @@ public static function giveItem(
                                 ($ola_type == SLM::TTO && $ola_end_time)
                                 || (in_array($orig_id, [180, 185]))
                             ) {
-                                $out .= $ola_name . ' : ' . htmlescape(\Html::convDateTime($due_time)) . '</br>';
+                                $out .= $ola_name . ' : ' . htmlescape(Html::convDateTime($due_time)) . '</br>';
                                 continue;
                             }
 

src/OLA.php

@@ -148,9 +148,9 @@ public function addLevelToDo(Ticket $ticket, $levels_id, $olas_id)
 
         $_ticket = new Ticket();
         if (
-            $_ticket->getFromDB($ticket->getID()) &&
-            $this->levelCanBeAddedInLevelsTodo($ticket, $items_ola) &&
-            $date !== null
+            $_ticket->getFromDB($ticket->getID())
+            && $this->levelCanBeAddedInLevelsTodo($ticket, $items_ola)
+            && $date !== null
         ) {
             $toadd = [];
             $toadd['date'] = $date;
@@ -243,10 +243,10 @@ public function getAddConfirmation(): array
     private function levelCanBeAddedInLevelsTodo(Ticket $ticket, Item_Ola $items_ola): bool
     {
         if (
-            $ticket->isDeleted() ||
-            $ticket->fields['status'] == CommonITILObject::CLOSED ||
-            $ticket->fields['status'] == CommonITILObject::SOLVED ||
-            !is_null($items_ola->fields['end_time'])
+            $ticket->isDeleted()
+            || $ticket->fields['status'] == CommonITILObject::CLOSED
+            || $ticket->fields['status'] == CommonITILObject::SOLVED
+            || !is_null($items_ola->fields['end_time'])
         ) {
             return false;
         }

src/Ticket.php

@@ -5394,7 +5394,7 @@ public function getValueToSelect($field_id_or_search_options, $name = '', $value
     public function showStatsDates()
     {
         // function to get strtotime safely, do not use if string is supposed to always be defined
-        $safe_get_strtime = static function ($date_string): int|null {
+        $safe_get_strtime = static function ($date_string): ?int {
             try {
                 return strtotime((string) $date_string);
             } catch (DatetimeException $e) {
@@ -6436,14 +6436,14 @@ private function transformOlasInputForBackwardCompatibility(array $input): array
 
         // remove old fields and add new fields
         if (isset($input['olas_id_tto'])) {
-            Toolbox::deprecated('Passing `olas_id_tto` input to ticket is deprecated.' .
-                ' Use `_olas_id` (array) + `_la_update` instead.', version: "11.1");
+            Toolbox::deprecated('Passing `olas_id_tto` input to ticket is deprecated.'
+                . ' Use `_olas_id` (array) + `_la_update` instead.', version: "11.1");
             $input['_olas_id'][] = $input['olas_id_tto'];
             unset($input['olas_id_tto']);
         }
         if (isset($input['olas_id_ttr'])) {
-            Toolbox::deprecated('Passing `olas_id_ttr` input to ticket is deprecated.' .
-                ' Use `_olas_id` (array) + `_la_update` instead.', version: "11.1");
+            Toolbox::deprecated('Passing `olas_id_ttr` input to ticket is deprecated.'
+                . ' Use `_olas_id` (array) + `_la_update` instead.', version: "11.1");
             $input['_olas_id'][] = $input['olas_id_ttr'];
             unset($input['olas_id_ttr']);
         }