Merge remote-tracking branch 'origin/support/2.13.0' into support/2.14.0

Author: btry

ajax/homepage_wizard.php

@@ -35,14 +35,15 @@
    exit;
 }
 
+if (!isset($_REQUEST['wizard'])) {
+   http_response_code(400);
+   die();
+}
+
 if ($_REQUEST['wizard'] == 'categories') {
    plugin_formcreator_showWizardCategories();
 } else if ($_REQUEST['wizard'] == 'forms') {
-   if (isset($_REQUEST['categoriesId'])) {
-      $categoriesId = (int) $_REQUEST['categoriesId'];
-   } else {
-      $categoriesId = 0;
-   }
+   $categoriesId = (int) ($_REQUEST['categoriesId'] ?? 0);
    $keywords = isset($_REQUEST['keywords']) ? $_REQUEST['keywords'] : '';
    $helpdeskHome = isset($_REQUEST['helpdeskHome']) ? $_REQUEST['helpdeskHome'] != '0' : false;
    plugin_formcreator_showWizardForms($categoriesId, $keywords, $helpdeskHome);

inc/issue.class.php

@@ -1242,7 +1242,7 @@ public function rawSearchOptions() {
                      'joinparams'      => [
                         'jointype'        => 'empty',
                         'condition'       => [
-                           new \QueryExpression(
+                           new QueryExpression(
                               '1=1'
                            ),
                         ],

tests/3-unit/PluginFormcreatorCategory.php

@@ -30,6 +30,9 @@
  */
 namespace tests\units;
 use GlpiPlugin\Formcreator\Tests\CommonTestCase;
+use Entity;
+use PluginFormcreatorForm;
+use Session;
 
 class PluginFormcreatorCategory extends CommonTestCase {
    public function providerGetTypeName() {
@@ -80,15 +83,15 @@ public function testGetCategoryTree() {
 
       // create a sub entity which will take in the forms and cateory for this test
       // and not conflict with previous data
-      $entity      = new \Entity();
+      $entity      = new Entity();
       $rand        = mt_rand();
       $entities_id = $entity->add([
          'name'        => "test formcreator sub entity $rand",
          'entities_id' => 0
       ]);
 
       // create some categories for forms
-      $category   = new \PluginFormcreatorCategory;
+      $category   = $this->newTestedInstance();
       $categories = [];
       for ($i = 0; $i < 5; $i++) {
          $root_cat = $category->add([
@@ -104,7 +107,7 @@ public function testGetCategoryTree() {
       }
 
       // create some forms
-      $form = new \PluginFormcreatorForm;
+      $form = new PluginFormcreatorForm;
       for ($i = 0; $i < 10; $i++) {
          $form->add([
             'name'                             => "testgetCategoryTree form $i",
@@ -116,10 +119,11 @@ public function testGetCategoryTree() {
       }
 
       // Set active entity
-      \Session::changeActiveEntities($entities_id, true);
+      Session::changeActiveEntities($entities_id, true);
 
       //test method
-      $tree = \PluginFormcreatorCategory::getCategoryTree();
+      $testedClassName = $this->getTestedClassName();
+      $tree = $testedClassName::getCategoryTree();
       $this->array($tree)
          ->isNotEmpty()
          ->child['subcategories'](function($child) {
@@ -132,6 +136,6 @@ public function testGetCategoryTree() {
       }
 
       // return to root entity
-      \Session::changeActiveEntities(0, true);
+      Session::changeActiveEntities(0, true);
    }
 }