Various deprecation message fixed

Leantime · Sep 21, 2024 · 017a75e · 017a75e
1 parent 807c849
commit 017a75e
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 54 deletions.
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
diff --git a/app/Core/Events/DispatchesEvents.php b/app/Core/Events/DispatchesEvents.php
@@ -10,7 +10,6 @@
      */
     trait DispatchesEvents
     {
-        private static string $event_context = '';
 
         /**
          * dispatches an event with context
@@ -42,7 +41,7 @@ public static function dispatch_event(string $hook, mixed $available_params = []
          */
         public static function dispatch_filter(string $hook, mixed $payload, mixed $available_params = [], string|int $function = null): mixed
         {
-            return EventDispatcher::dispatch_filter($hook, $payload, $available_params, static::get_event_context($function));
+            return EventDispatcher::dispatch_filter($hook, $payload, $available_params, DispatchesEvents::get_event_context($function));
         }
 
         /**
@@ -53,17 +52,16 @@ public static function dispatch_filter(string $hook, mixed $payload, mixed $avai
          * @param $function
          * @return string
          */
-        protected static function get_event_context($function): string
+        public static function get_event_context($function): string
         {
-            if (empty(self::$event_context)) {
-                self::$event_context = static::set_class_context();
-            }
+
+            $event_context = DispatchesEvents::set_class_context();
 
             $function = !empty($function) && is_string($function) && !is_numeric($function)
                 ? $function
-                : static::get_function_context(is_numeric($function) ? (int) $function : null);
+                : DispatchesEvents::get_function_context(is_numeric($function) ? (int) $function : null);
 
-            return self::$event_context . '.' . $function;
+            return $event_context . '.' . $function;
         }
 
         /**
@@ -74,7 +72,7 @@ protected static function get_event_context($function): string
          *
          * @return string
          */
-        private static function set_class_context(): string
+        public static function set_class_context(): string
         {
             return str_replace('\\', '.', strtolower(get_called_class()));
         }
@@ -89,7 +87,7 @@ private static function set_class_context(): string
          * @param ?int $functionInt
          * @return string
          */
-        private static function get_function_context(?int $functionInt = null): string
+        public static function get_function_context(?int $functionInt = null): string
         {
             $tracePointer = is_int($functionInt) ? $functionInt : 3;
 

diff --git a/app/Domain/Auth/Controllers/KeepAlive.php b/app/Domain/Auth/Controllers/KeepAlive.php
@@ -8,7 +8,8 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- *
+ * Keeping the session alive when not active
+ * @Deprecated With laravels new session management we should not need this anymore
  */
 class KeepAlive extends Controller
 {

diff --git a/app/Domain/Calendar/Controllers/ExternalCal.php b/app/Domain/Calendar/Controllers/ExternalCal.php
@@ -60,9 +60,14 @@ public function run(): void
             $cal = $this->calendarRepo->getExternalCalendar($calId, session("userdata.id"));
 
             if (isset($cal["url"])) {
-                $content = $this->loadIcalUrl($cal["url"]);
-                session(["calendarCache.".$calId.".lastUpdate" => time()]);
-                session(["calendarCache.".$calId."content" => $content]);
+
+                try {
+                    $content = $this->loadIcalUrl($cal["url"]);
+                    session(["calendarCache." . $calId . ".lastUpdate" => time()]);
+                    session(["calendarCache." . $calId . "content" => $content]);
+                }catch(\Exception $e) {
+                    $content = "";
+                }
             }
         }
 
@@ -94,6 +99,7 @@ private function loadIcalUrl(string $url): string
         }
 
         try {
+
             $response = $guzzle->request('GET', $url, [
                 'headers' => [
                     'Accept' => 'text/calendar',

diff --git a/app/Domain/Goalcanvas/Templates/showCanvas.blade.php b/app/Domain/Goalcanvas/Templates/showCanvas.blade.php
@@ -114,7 +114,7 @@ class="delete">{{ __('links.icon.delete') }}</a></li>
                     <div class="pull-right">
                         <div class="btn-group viewDropDown">
                             @if (count($allCanvas) > 0 && !empty($statusLabels))
-                                @if ($filter['status'] == 'all')
+                                @if (($filter['status'] ?? '') == 'all')
                                     <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fas fa-filter"></i>
                                         {!! __('status.all') !!} {!! __('links.view') !!}</button>
                                 @else

diff --git a/app/Domain/Projects/Models/Project.php b/app/Domain/Projects/Models/Project.php
@@ -31,6 +31,8 @@ class Project
 
         public $status;
 
+        public $clientName;
+
 
 
         public function __construct()

diff --git a/app/Domain/Timesheets/Services/Timesheets.php b/app/Domain/Timesheets/Services/Timesheets.php
@@ -60,8 +60,9 @@ public function isClocked(int $sessionId): false|array
      *
      * @api
      */
-    public function punchIn(int $ticketId): mixed
+    public function punchIn(int|string $ticketId): mixed
     {
+        $ticketId = (int)$ticketId;
         return $this->timesheetsRepo->punchIn($ticketId);
     }
 
@@ -72,8 +73,9 @@ public function punchIn(int $ticketId): mixed
      *
      * @api
      */
-    public function punchOut(int $ticketId): float|false|int
+    public function punchOut(int|string $ticketId): float|false|int
     {
+        $ticketId = (int)$ticketId;
         return $this->timesheetsRepo->punchOut($ticketId);
     }
 

diff --git a/app/Domain/Wiki/Models/Template.php b/app/Domain/Wiki/Models/Template.php
@@ -10,6 +10,7 @@ class Template
         public $title;
         public $description;
         public $content;
+        public $category;
 
         public function __construct()
         {

diff --git a/app/Domain/Wiki/Models/Wiki.php b/app/Domain/Wiki/Models/Wiki.php
@@ -12,6 +12,7 @@ class Wiki
         public $author;
         public $created;
         public $projectId;
+        public $category;
 
         public function __construct()
         {

diff --git a/app/Domain/Wiki/Services/Wiki.php b/app/Domain/Wiki/Services/Wiki.php
@@ -160,25 +160,6 @@ public function updateArticle(Article $article): bool
             return $this->wikiRepository->updateArticle($article);
         }
 
-        public function getDefaultWiki($projectId) {
-
-            //Clear cache
-            $this->clearWikiCache();
-
-            $wikis = $this->wikiService->getAllProjectWikis($projectId);
-
-            if($wikis)
-
-            if ($wiki) {
-                //Set the session
-                session(["currentWiki" => $id]);
-                return true;
-            }
-
-            return false;
-
-        }
-
         public function setCurrentWiki($id) {
 
             //Clear cache

diff --git a/app/Views/Templates/sections/pageBottom.blade.php b/app/Views/Templates/sections/pageBottom.blade.php
@@ -8,15 +8,6 @@
     </script>
 @endif
 
-@if ($loggedIn)
-    <script>
-        //5 min keep alive timer
-        setInterval(function(){
-            jQuery.get(leantime.appUrl+'/auth/keepAlive');
-        }, 300000);
-    </script>
-@endif
-
 <script src="{!! BASE_URL !!}/dist/js/compiled-footer.{!! $version !!}.min.js"></script>
 
 @dispatchEvent('beforeBodyClose')