fix(condition): catch comparison exception

btry · btry · commit 4bdaab4b0418 · 2020-08-14T10:07:56.000+02:00
Signed-off-by: Thierry Bugier &lt;tbugier@teclib.com&gt;
diff --git a/inc/fields.class.php b/inc/fields.class.php
@@ -29,6 +29,8 @@
  * ---------------------------------------------------------------------
  */
 
+use GlpiPlugin\Formcreator\Exception\ComparisonException;
+
 if (!defined('GLPI_ROOT')) {
    die("Sorry. You can't access this file directly");
 }
@@ -226,7 +228,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,
                   }
                   try {
                      $value = self::isVisible($conditionField->getQuestion(), $fields);
-                  } catch (PluginFormcreatorComparisonException $e) {
+                  } catch (ComparisonException $e) {
                      $value = false;
                   }
                   break;
@@ -237,7 +239,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,
                   }
                   try {
                      $value = !self::isVisible($conditionField->getQuestion(), $fields);
-                  } catch (PluginFormcreatorComparisonException $e) {
+                  } catch (ComparisonException $e) {
                      $value = false;
                   }
                   break;
@@ -252,7 +254,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,
                      }
                      try {
                         $value = $conditionField->notEquals($condition['value']);
-                     } catch (PluginFormcreatorComparisonException $e) {
+                     } catch (ComparisonException $e) {
                         $value = false;
                      }
                      break;
@@ -264,7 +266,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,
                      }
                      try {
                         $value = $conditionField->equals($condition['value']);
-                     } catch (PluginFormcreatorComparisonException $e) {
+                     } catch (ComparisonException $e) {
                         $value = false;
                      }
                      break;
@@ -276,7 +278,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,
                      }
                      try {
                         $value = $conditionField->greaterThan($condition['value']);
-                     } catch (PluginFormcreatorComparisonException $e) {
+                     } catch (ComparisonException $e) {
                         $value = false;
                      }
                      break;
@@ -288,7 +290,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,
                      }
                      try {
                         $value = $conditionField->lessThan($condition['value']);
-                     } catch (PluginFormcreatorComparisonException $e) {
+                     } catch (ComparisonException $e) {
                         $value = false;
                      }
                      break;
@@ -301,7 +303,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,
                      try {
                         $value = ($conditionField->greaterThan($condition['value'])
                                  || $conditionField->equals($condition['value']));
-                     } catch (PluginFormcreatorComparisonException $e) {
+                     } catch (ComparisonException $e) {
                         $value = false;
                      }
                      break;
@@ -314,7 +316,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,
                      try {
                         $value = ($conditionField->lessThan($condition['value'])
                                  || $conditionField->equals($condition['value']));
-                     } catch (PluginFormcreatorComparisonException $e) {
+                     } catch (ComparisonException $e) {
                         $value = false;
                      }
                      break;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`	`* ---------------------------------------------------------------------`
`30`	`30`	`*/`
`31`	`31`
	`32`	`+use GlpiPlugin\Formcreator\Exception\ComparisonException;`
	`33`	`+`
`32`	`34`	`if (!defined('GLPI_ROOT')) {`
`33`	`35`	`die("Sorry. You can't access this file directly");`
`34`	`36`	`}`
`@@ -226,7 +228,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,`
`226`	`228`	`}`
`227`	`229`	`try {`
`228`	`230`	`$value = self::isVisible($conditionField->getQuestion(), $fields);`
`229`		`- } catch (PluginFormcreatorComparisonException $e) {`
	`231`	`+ } catch (ComparisonException $e) {`
`230`	`232`	`$value = false;`
`231`	`233`	`}`
`232`	`234`	`break;`
`@@ -237,7 +239,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,`
`237`	`239`	`}`
`238`	`240`	`try {`
`239`	`241`	`$value = !self::isVisible($conditionField->getQuestion(), $fields);`
`240`		`- } catch (PluginFormcreatorComparisonException $e) {`
	`242`	`+ } catch (ComparisonException $e) {`
`241`	`243`	`$value = false;`
`242`	`244`	`}`
`243`	`245`	`break;`
`@@ -252,7 +254,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,`
`252`	`254`	`}`
`253`	`255`	`try {`
`254`	`256`	`$value = $conditionField->notEquals($condition['value']);`
`255`		`- } catch (PluginFormcreatorComparisonException $e) {`
	`257`	`+ } catch (ComparisonException $e) {`
`256`	`258`	`$value = false;`
`257`	`259`	`}`
`258`	`260`	`break;`
`@@ -264,7 +266,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,`
`264`	`266`	`}`
`265`	`267`	`try {`
`266`	`268`	`$value = $conditionField->equals($condition['value']);`
`267`		`- } catch (PluginFormcreatorComparisonException $e) {`
	`269`	`+ } catch (ComparisonException $e) {`
`268`	`270`	`$value = false;`
`269`	`271`	`}`
`270`	`272`	`break;`
`@@ -276,7 +278,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,`
`276`	`278`	`}`
`277`	`279`	`try {`
`278`	`280`	`$value = $conditionField->greaterThan($condition['value']);`
`279`		`- } catch (PluginFormcreatorComparisonException $e) {`
	`281`	`+ } catch (ComparisonException $e) {`
`280`	`282`	`$value = false;`
`281`	`283`	`}`
`282`	`284`	`break;`
`@@ -288,7 +290,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,`
`288`	`290`	`}`
`289`	`291`	`try {`
`290`	`292`	`$value = $conditionField->lessThan($condition['value']);`
`291`		`- } catch (PluginFormcreatorComparisonException $e) {`
	`293`	`+ } catch (ComparisonException $e) {`
`292`	`294`	`$value = false;`
`293`	`295`	`}`
`294`	`296`	`break;`
`@@ -301,7 +303,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,`
`301`	`303`	`try {`
`302`	`304`	`$value = ($conditionField->greaterThan($condition['value'])`
`303`	`305`	`\|\| $conditionField->equals($condition['value']));`
`304`		`- } catch (PluginFormcreatorComparisonException $e) {`
	`306`	`+ } catch (ComparisonException $e) {`
`305`	`307`	`$value = false;`
`306`	`308`	`}`
`307`	`309`	`break;`
`@@ -314,7 +316,7 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,`
`314`	`316`	`try {`
`315`	`317`	`$value = ($conditionField->lessThan($condition['value'])`
`316`	`318`	`\|\| $conditionField->equals($condition['value']));`
`317`		`- } catch (PluginFormcreatorComparisonException $e) {`
	`319`	`+ } catch (ComparisonException $e) {`
`318`	`320`	`$value = false;`
`319`	`321`	`}`
`320`	`322`	`break;`