From 54c9ac82fd15263a0673a91e926744f7381586da Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alejandro.gallardo@artica.es>
Date: Tue, 9 Apr 2019 16:35:58 +0200
Subject: [PATCH] Visual Console Refactor: catching Throwable instead of
 Exception

Former-commit-id: 34afe6384ebeb54a6384416f8b8116a222dc9069
---
 .../include/rest-api/models/VisualConsole/Container.php    | 7 ++++++-
 .../include/rest-api/models/VisualConsole/Item.php         | 6 +++---
 .../include/rest-api/models/VisualConsole/Items/Clock.php  | 2 +-
 .../rest-api/models/VisualConsole/Items/ColorCloud.php     | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/rest-api/models/VisualConsole/Container.php b/pandora_console/include/rest-api/models/VisualConsole/Container.php
index 9212527627..a318039b1f 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Container.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Container.php
@@ -291,7 +291,12 @@ final class Container extends Model
             $itemId = (int) $data['id'];
             $itemType = (int) $data['type'];
             $class = static::getItemClass($itemType);
-            \array_push($items, $class::fromDBWithId($itemId));
+
+            try {
+                \array_push($items, $class::fromDBWithId($itemId));
+            } catch (\Throwable $e) {
+                // TODO: Log this?
+            }
         }
 
         return $items;
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php
index d729876e08..2d42ed41fd 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Item.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php
@@ -898,7 +898,7 @@ class Item extends Model
                         // No autologin from the public view.
                         !$config['public_view']
                     );
-                } catch (\Exception $ignored) {
+                } catch (\Throwable $ignored) {
                     return null;
                 }
             }
@@ -1004,7 +1004,7 @@ class Item extends Model
                                 !$config['public_view']
                             );
                         }
-                    } catch (\Exception $ignored) {
+                    } catch (\Throwable $ignored) {
                         return null;
                     }
                 }
@@ -1055,7 +1055,7 @@ class Item extends Model
                             // No autologin from the public view.
                             !$config['public_view']
                         );
-                    } catch (\Exception $ignored) {
+                    } catch (\Throwable $ignored) {
                         return null;
                     }
                 }
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php b/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php
index a6b0560a38..affcd1f83f 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php
@@ -46,7 +46,7 @@ final class Clock extends Item
             $clockData['clockTimezoneOffset'] = $timezone->getOffset(
                 $dateTimeUtc
             );
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             throw new \InvalidArgumentException($e->getMessage());
         }
 
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php b/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
index 3dded61d08..bc53c22b6c 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
@@ -172,7 +172,7 @@ final class ColorCloud extends Item
                     }
                 }
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             throw new \InvalidArgumentException('invalid dynamic data');
         }