Merge pull request #159 from audetv/develop

Develop
terratensor · Apr 28, 2023 · 612e7dc · 612e7dc
2 parents 72776d5 + de98196
commit 612e7dc
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 271 deletions.
diff --git a/app/common/config/params.php b/app/common/config/params.php
@@ -51,9 +51,7 @@
         ],
     ],
     'feature-toggle' => [
-        'features' => [
-            'SEARCH_FIX_DATE' => false,
-        ],
+        'features' => [],
     ],
     'indexes' => [
         'common' => 'questions',

diff --git a/app/frontend/controllers/SiteController.php b/app/frontend/controllers/SiteController.php
@@ -3,7 +3,6 @@
 namespace frontend\controllers;
 
 use App\Contact\Http\Action\V1\Contact\ContactAction;
-use App\FeatureToggle\FeatureFlag;
 use App\forms\SearchForm;
 use App\Question\Entity\Statistic\QuestionStatsRepository;
 use App\Search\Http\Action\V1\SearchSettings\ToggleAction;
@@ -20,21 +19,18 @@ class SiteController extends Controller
 {
     private ManticoreService $service;
     private QuestionStatsRepository $questionStatsRepository;
-    private FeatureFlag $flag;
 
     public function __construct(
         $id,
         $module,
         ManticoreService $service,
         QuestionStatsRepository $questionStatsRepository,
-        FeatureFlag $flag,
         $config = []
     )
     {
         parent::__construct($id, $module, $config);
         $this->service = $service;
         $this->questionStatsRepository = $questionStatsRepository;
-        $this->flag = $flag;
     }
 
     /**
@@ -91,7 +87,7 @@ public function actions(): array
      *
      * @return string
      */
-    public function actionIndex($feature = null): string
+    public function actionIndex(): string
     {
         $this->layout = 'search';
         $results = null;
@@ -106,19 +102,6 @@ public function actionIndex($feature = null): string
             Yii::$app->session->setFlash('error', $e->getMessage());
         }
 
-        foreach ($this->flag->features as $key => $value) {
-            if ($feature === $key) {
-                $this->flag->enable($key);
-            }
-        }
-
-        if ($this->flag->isEnabled('SEARCH_FIX_DATE')) {
-            return $this->render('feature/fix-index', [
-                'results' => $results ?? null,
-                'model' => $form,
-            ]);
-        }
-
         return $this->render('index', [
             'results' => $results ?? null,
             'model' => $form,

diff --git a/app/frontend/views/site/feature/fix-index.php b/app/frontend/views/site/feature/fix-index.php
diff --git a/app/src/helpers/VersionHelper.php b/app/src/helpers/VersionHelper.php
@@ -14,7 +14,7 @@ class VersionHelper
      */
     public static function version(): string
     {
-        $version = 'v0.4.0';
+        $version = 'v0.5.0';
         return Html::a($version, 'https://github.com/audetv/fct-search/releases/latest', ['target' => '_blank']);
     }
 }