Use glpi-project/phpstan-glpi PHPStan rules

composer.json

@@ -107,6 +107,7 @@
         "atoum/atoum": "^4.3",
         "friendsofphp/php-cs-fixer": "^3.75",
         "friendsoftwig/twigcs": "^6.5",
+        "glpi-project/phpstan-glpi": "^1.0",
         "glpi-project/tools": "^0.7",
         "mikey179/vfsstream": "^1.6",
         "nikic/php-parser": "^5.5",

phpstan.neon.dist

@@ -72,10 +72,6 @@ parameters:
         -
             message: '~/(xhprof_runs\.php|xhprof_lib\.php|downstream\.php|local_define\.php|config_db\.php|config_db_slave\.php)" is not a file or it does not exist.~'
             reportUnmatched: false
-rules:
-    - Glpi\Tools\PHPStan\ForbidExitRule
-    - Glpi\Tools\PHPStan\ForbidHttpResponseCodeRule
-    - GlpiProject\Tools\PHPStan\Rules\GlobalVarTypeRule
 
 # Copy and uncomment this content into a "phpstan.neon" file to add your own config values
 #

phpunit/abstracts/SortStrategyTestCase.php

@@ -96,7 +96,7 @@ public function testSort(): void
         $items = self::$manager->getItems($item_request)['items'];
 
         // Sort the items using the strategy
-        $sortedItems = $this->getSortStrategyEnum()->getConcreteStrategy()
+        $sortedItems = $this->getSortStrategyEnum()->getStrategy()
             ->sort($items);
 
         // Verify the sorting against the expected order

phpunit/functional/Glpi/Form/AccessControl/ControlType/AllowListTest.php

@@ -66,17 +66,17 @@ public function testGetIcon(): void
         $this->assertNotEmpty($allow_list->getIcon());
     }
 
-    public function testGetConfigClass(): void
+    public function testGetConfig(): void
     {
         $allow_list = new AllowList();
 
         // Not much to test here, just ensure the method run without errors
-        $class = $allow_list->getConfigClass();
+        $class = $allow_list->getConfig();
         $this->assertNotEmpty($class);
 
         // Ensure the class exists and is valid
         $is_valid =
-            is_a($class, JsonFieldInterface::class, true)
+            is_a($class, JsonFieldInterface::class)
             && !(new \ReflectionClass($class))->isAbstract()
         ;
         $this->assertTrue($is_valid);

phpunit/functional/Glpi/Form/AccessControl/ControlType/DirectAccessTest.php

@@ -67,17 +67,17 @@ public function testGetIcon(): void
         $this->assertNotEmpty($direct_access->getIcon());
     }
 
-    public function testGetConfigClass(): void
+    public function testGetConfig(): void
     {
         $direct_access = new DirectAccess();
 
         // Not much to test here, just ensure the method run without errors
-        $class = $direct_access->getConfigClass();
+        $class = $direct_access->getConfig();
         $this->assertNotEmpty($class);
 
         // Ensure the class exists and is valid
         $is_valid =
-            is_a($class, JsonFieldInterface::class, true)
+            is_a($class, JsonFieldInterface::class)
             && !(new \ReflectionClass($class))->isAbstract()
         ;
         $this->assertTrue($is_valid);

phpunit/functional/Glpi/Form/Migration/TargetsMigrationTest.php

@@ -337,13 +337,23 @@ public function testFormMigrationWithTargets($form_name, $expected_destinations)
         $form = getItemByTypeName(Form::class, $form_name);
         $destinations = $form->getDestinations();
         foreach ($destinations as $destination) {
+            /** @var AbstractCommonITILFormDestination $itil_destination */
             $itil_destination = $destination->getConcreteDestinationItem();
 
             // Find the matching expected destination
             $expected_destination = current(array_filter(
                 $expected_destinations,
-                fn($expected_destination) => (new $expected_destination['itemtype']())->getTargetItemtype() === $itil_destination->getTargetItemtype()
-                    && $expected_destination['name'] === $destination->fields['name']
+                function ($expected_destination) use ($itil_destination, $destination) {
+                    if ((new $expected_destination['itemtype']())->getTarget()::class !== $itil_destination->getTarget()::class) {
+                        return false;
+                    }
+
+                    if ($expected_destination['name'] !== $destination->fields['name']) {
+                        return false;
+                    }
+
+                    return true;
+                }
             ));
             $this->assertNotFalse($expected_destination);
 

phpunit/functional/Glpi/Form/Tag/AnswerTagProviderTest.php

@@ -61,12 +61,12 @@ public function testGetTagsForFormWithFirstAndLastNameQuestion(): void
             new Tag(
                 label: 'Answer: First name',
                 value: $this->getQuestionId($form, 'First name'),
-                provider: AnswerTagProvider::class,
+                provider: new AnswerTagProvider(),
             ),
             new Tag(
                 label: 'Answer: Last name',
                 value: $this->getQuestionId($form, 'Last name'),
-                provider: AnswerTagProvider::class,
+                provider: new AnswerTagProvider(),
             ),
         ]);
     }

phpunit/functional/Glpi/Form/Tag/CommentDescriptionTagProviderTest.php

@@ -59,12 +59,12 @@ public function testGetTagsForFormWithSections(): void
             new Tag(
                 label: 'Comment description: First comment description',
                 value: $this->getCommentId($form, 'First comment title'),
-                provider: CommentDescriptionTagProvider::class,
+                provider: new CommentDescriptionTagProvider(),
             ),
             new Tag(
                 label: 'Comment description: Second comment description',
                 value: $this->getCommentId($form, 'Second comment title'),
-                provider: CommentDescriptionTagProvider::class,
+                provider: new CommentDescriptionTagProvider(),
             ),
         ]);
     }

phpunit/functional/Glpi/Form/Tag/CommentTitleTagProviderTest.php

@@ -59,12 +59,12 @@ public function testGetTagsForFormWithSections(): void
             new Tag(
                 label: 'Comment title: First comment title',
                 value: $this->getCommentId($form, 'First comment title'),
-                provider: CommentTitleTagProvider::class,
+                provider: new CommentTitleTagProvider(),
             ),
             new Tag(
                 label: 'Comment title: Second comment title',
                 value: $this->getCommentId($form, 'Second comment title'),
-                provider: CommentTitleTagProvider::class,
+                provider: new CommentTitleTagProvider(),
             ),
         ]);
     }

phpunit/functional/Glpi/Form/Tag/FormTagProviderTest.php

@@ -53,7 +53,7 @@ public function testGetTagsForEmptyForm(): void
             new Tag(
                 label: 'Form name: Test form',
                 value: $form->getId(),
-                provider: FormTagProvider::class,
+                provider: new FormTagProvider(),
             ),
         ]);
     }
@@ -65,7 +65,7 @@ public function testGetTagsForFormWithName(): void
             new Tag(
                 label: 'Form name: My form',
                 value: $form->getId(),
-                provider: FormTagProvider::class,
+                provider: new FormTagProvider(),
             ),
         ]);
     }

phpunit/functional/Glpi/Form/Tag/FormTagsManagerTest.php

@@ -61,42 +61,42 @@ public function testGetTags(): void
             new Tag(
                 label: 'Form name: First and last name form',
                 value: $form->getId(),
-                provider: FormTagProvider::class,
+                provider: new FormTagProvider(),
             ),
             new Tag(
                 label: 'Section: Personal information',
                 value: $this->getSectionId($form, 'Personal information'),
-                provider: SectionTagProvider::class,
+                provider: new SectionTagProvider(),
             ),
             new Tag(
                 label: 'Comment title: Comment title',
                 value: $this->getCommentId($form, 'Comment title'),
-                provider: CommentTitleTagProvider::class,
+                provider: new CommentTitleTagProvider(),
             ),
             new Tag(
                 label: 'Comment description: Comment description',
                 value: $this->getCommentId($form, 'Comment title'),
-                provider: CommentDescriptionTagProvider::class,
+                provider: new CommentDescriptionTagProvider(),
             ),
             new Tag(
                 label: 'Question: First name',
                 value: $this->getQuestionId($form, 'First name'),
-                provider: QuestionTagProvider::class,
+                provider: new QuestionTagProvider(),
             ),
             new Tag(
                 label: 'Question: Last name',
                 value: $this->getQuestionId($form, 'Last name'),
-                provider: QuestionTagProvider::class,
+                provider: new QuestionTagProvider(),
             ),
             new Tag(
                 label: 'Answer: First name',
                 value: $this->getQuestionId($form, 'First name'),
-                provider: AnswerTagProvider::class,
+                provider: new AnswerTagProvider(),
             ),
             new Tag(
                 label: 'Answer: Last name',
                 value: $this->getQuestionId($form, 'Last name'),
-                provider: AnswerTagProvider::class,
+                provider: new AnswerTagProvider(),
             ),
         ];
 

phpunit/functional/Glpi/Form/Tag/QuestionTagProviderTest.php

@@ -59,12 +59,12 @@ public function testGetTagsForFormWithoutWithFirstAndLastNameQuestions(): void
             new Tag(
                 label: 'Question: First name',
                 value: $this->getQuestionId($form, 'First name'),
-                provider: \Glpi\Form\Tag\QuestionTagProvider::class,
+                provider: new \Glpi\Form\Tag\QuestionTagProvider(),
             ),
             new Tag(
                 label: 'Question: Last name',
                 value: $this->getQuestionId($form, 'Last name'),
-                provider: \Glpi\Form\Tag\QuestionTagProvider::class,
+                provider: new \Glpi\Form\Tag\QuestionTagProvider(),
             ),
         ]);
     }

phpunit/functional/Glpi/Form/Tag/SectionTagProviderTest.php

@@ -59,12 +59,12 @@ public function testGetTagsForFormWithSections(): void
             new Tag(
                 label: 'Section: Personal information',
                 value: $this->getSectionId($form, 'Personal information'),
-                provider: SectionTagProvider::class,
+                provider: new SectionTagProvider(),
             ),
             new Tag(
                 label: 'Section: Professional information',
                 value: $this->getSectionId($form, 'Professional information'),
-                provider: SectionTagProvider::class,
+                provider: new SectionTagProvider(),
             ),
         ]);
     }

phpunit/functional/Glpi/RichText/RichTextTest.php

@@ -370,7 +370,7 @@ public function () {
         $tag = new Tag(
             label: __("My label"),
             value: 5, // Fake id
-            provider: AnswerTagProvider::class,
+            provider: new AnswerTagProvider(),
         );
         yield 'Html content of form tags should not be modified' => [
             'content' => $tag->html,

src/ChangeTemplate.php

@@ -42,6 +42,12 @@ class ChangeTemplate extends ITILTemplate
 {
     use Glpi\Features\Clonable;
 
+    #[Override]
+    public static function getPredefinedFields(): ITILTemplatePredefinedField
+    {
+        return new ChangeTemplatePredefinedField();
+    }
+
     public static function getTypeName($nb = 0)
     {
         return _n('Change template', 'Change templates', $nb);

src/Glpi/Form/AccessControl/ControlType/AllowList.php

@@ -66,9 +66,9 @@ public function getIcon(): string
     }
 
     #[Override]
-    public function getConfigClass(): string
+    public function getConfig(): JsonFieldInterface
     {
-        return AllowListConfig::class;
+        return new AllowListConfig();
     }
 
     #[Override]

src/Glpi/Form/AccessControl/ControlType/ControlTypeInterface.php

@@ -60,11 +60,11 @@ public function getLabel(): string;
     public function getIcon(): string;
 
     /**
-     * Get the free json config config class name for this object.
+     * Get a new instance of the config object for this control type.
      *
-     * @return string Class name which implements JsonFieldInterface
+     * @return JsonFieldInterface
      */
-    public function getConfigClass(): string;
+    public function getConfig(): JsonFieldInterface;
 
     /**
      * Get the warnings for the given form.

src/Glpi/Form/AccessControl/ControlType/DirectAccess.php

@@ -61,9 +61,9 @@ public function getIcon(): string
     }
 
     #[Override]
-    public function getConfigClass(): string
+    public function getConfig(): JsonFieldInterface
     {
-        return DirectAccessConfig::class;
+        return new DirectAccessConfig();
     }
 
     #[Override]