Merge branch 'main' into issue-3911issue-3911

1 files changed, 10 insertions, 7 deletions

diff --git a/lib/models/Freetext.php b/lib/models/Freetext.php
index 52182de..f241b5a 100644
--- a/lib/models/Freetext.php
+++ b/lib/models/Freetext.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'lib/classes/QuestionType.interface.php';
+require_once 'lib/classes/QuestionType.php';
 
 /**
  * @license GPL2 or any later version
@@ -65,12 +65,13 @@ class Freetext extends QuestionnaireQuestion implements QuestionType
 
     /**
      * Returns the template of this question to answer the question.
-     * @return Flexi_Template
-     * @throws Flexi_TemplateNotFoundException if there is no template.
+     *
+     * @return Flexi\Template
+     * @throws Flexi\TemplateNotFoundException if there is no template.
      */
     public function getDisplayTemplate()
     {
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__ . '/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__ . '/../../app/views'));
         $template = $factory->open('questionnaire/question_types/freetext/freetext_answer.php');
         $template->vote = $this;
         return $template;
@@ -97,9 +98,11 @@ class Freetext extends QuestionnaireQuestion implements QuestionType
 
     /**
      * Returns the template with the answers of the question so far.
+     *
      * @param null $only_user_ids : array of user_ids
-     * @return Flexi_Template
-     * @throws Flexi_TemplateNotFoundException if there is no template.
+     *
+     * @return Flexi\Template
+     * @throws Flexi\TemplateNotFoundException if there is no template.
      */
     public function getResultTemplate($only_user_ids = null)
     {
@@ -111,7 +114,7 @@ class Freetext extends QuestionnaireQuestion implements QuestionType
                 }
             }
         }
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__ . '/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__ . '/../../app/views'));
         $template = $factory->open('questionnaire/question_types/freetext/freetext_evaluation.php');
         $template->vote = $this;
         $template->set_attribute('answers', $answers);