Merge branch 'pu/ps/sentry/3605' into '2022.11'

tweak(Tinebase/Frontend/Container): remove redundant exception handling See merge request tine20/tine20!3067
tine20 · Nov 28, 2022 · df9e563 · df9e563
2 parents efce3d7 + 5da86b9
commit df9e563
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/tine20/Tinebase/Container.php b/tine20/Tinebase/Container.php
@@ -1387,11 +1387,11 @@ public function setContainerColor($_containerId, $_color)
         if (! $this->hasGrant(Tinebase_Core::getUser(), $container, Tinebase_Model_Grants::GRANT_ADMIN)) {
             throw new Tinebase_Exception_AccessDenied('Permission to set color of container denied.');
         }
-        
+
         if (! preg_match('/^#[0-9a-fA-F]{6}$/', $_color)) {
             throw new Tinebase_Exception_UnexpectedValue('color is not valid');
         }
-        
+
         $container->color = $_color;
 
         return $this->update($container, 'update');

diff --git a/tine20/Tinebase/Frontend/Json/Container.php b/tine20/Tinebase/Frontend/Json/Container.php
@@ -138,20 +138,16 @@ public function renameContainer($containerId, $newName)
 
     /**
      * sets color of a container
-     * 
+     *
      * @param  int      $containerId
      * @param  string   $color
      * @return array    updated container
-     * @throws Tinebase_Exception
+     * @throws Tinebase_Exception_AccessDenied
      */
-    public function setContainerColor($containerId, $color)
+    public function setContainerColor($containerId, $color): array
     {
-        try {
-            $container = Tinebase_Container::getInstance()->setContainerColor($containerId, $color);
-        } catch (Tinebase_Exception $e) {
-            throw new Tinebase_Exception('Container not found or permission to set containername denied!');
-        }
-
+        $container = Tinebase_Container::getInstance()->setContainerColor($containerId, $color);
+
         $result = $container->toArray();
         $result['account_grants'] = Tinebase_Container::getInstance()->getGrantsOfAccount(Tinebase_Core::getUser(),
             $container)->toArray();
@@ -165,9 +161,9 @@ public function setContainerColor($containerId, $color)
      * @param   int     $containerId
      * @return  array
      */
-    public function getContainerGrants($containerId) 
+    public function getContainerGrants($containerId): array
     {
-        $container = Tinebase_Container::getInstance()->getContainerById($containerId);
+        Tinebase_Container::getInstance()->getContainerById($containerId);
 
         $result = array(
             'results'     => array(),