Dictionaries of custom models & types

Author: SebSept

.phpstan-baseline.php

@@ -2305,6 +2305,12 @@
 	'count' => 2,
 	'path' => __DIR__ . '/src/Glpi/Controller/ApiController.php',
 ];
+$ignoreErrors[] = [
+	'message' => '#^Class RuleCollection constructor invoked with 1 parameter, 0 required\\.$#',
+	'identifier' => 'arguments.count',
+	'count' => 1,
+	'path' => __DIR__ . '/src/Glpi/Controller/Rule/RuleListController.php',
+];
 $ignoreErrors[] = [
 	'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#',
 	'identifier' => 'nullCoalesce.expr',

front/asset/ruledictionarymodel.php

@@ -2,6 +2,7 @@ includes:
     - .phpstan-baseline.php
 
 parameters:
+#    treatPhpDocTypesAsCertain: false
     level: 4
     bootstrapFiles:
         - stubs/db_config_classes.php

front/asset/ruledictionarytype.php

@@ -58,17 +58,9 @@ public function __invoke(Request $request): Response
         $replay_rule =  $request->get('replay_rule');
         $reorder =      $request->request->get('action');
         $reorder =      $request->get('action'); // pour debug, à supprimer
-
-        // some requests have subtype query argument
-        // eg. http://.../front/ruleticket.php?reinit=true&subtype=RuleTicket
-        // but it's not used anymore
-        // because subtype is redundant with $request->attributes->get('class')
-        // $request->get('subtype');
-
         $item_class = $request->attributes->getString('class');
-        $this->ruleCollection = $this->getRuleCollectionInstanceFromRuleSubtype($item_class, (int) $_SESSION['glpiactive_entity']);
 
-        // @todo param subtype contient le type d'item sur certaines requetes http://localhost:8081/front/ruleticket.php?reinit=true&subtype=RuleTicket
+        $this->ruleCollection = $this->getRuleCollectionInstanceFromRuleSubtype($item_class, (int) $_SESSION['glpiactive_entity']);
 
         // dispatch
         if (!is_null($reorder)) {
@@ -268,9 +260,6 @@ private function getRuleCollectionInstanceFromRuleSubtype(string $item_subtype,
         }
         $rule = new $item_subtype();
         $collection_classname = $rule->getCollectionClassName();
-        if (!is_subclass_of($collection_classname, \RuleCollection::class)) {
-            throw new BadRequestHttpException(sprintf('Invalid Rule Collection type "%s"', htmlescape($collection_classname)));
-        }
 
         /**
          * Not all classes extendending RuleCollection have a constructor.