Now trying auto insert whenever a command is run

matgeroe · Apr 29, 2019 · 4b53035 · 4b53035
1 parent 64a9482
commit 4b53035
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 9 deletions.
diff --git a/src/Commands/DisableFeatureCommand.php b/src/Commands/DisableFeatureCommand.php
@@ -5,6 +5,7 @@
 use Illuminate\Console\Command;
 use MatthiasWilbrink\FeatureToggle\Exceptions\FeatureNotFoundException;
 use MatthiasWilbrink\FeatureToggle\Exceptions\NoFeaturesException;
+use MatthiasWilbrink\FeatureToggle\Exceptions\NoToggableFeaturesException;
 use MatthiasWilbrink\FeatureToggle\Facades\Feature;
 use MatthiasWilbrink\FeatureToggle\Models\Feature as FeatureModel;
 
@@ -31,6 +32,9 @@ class DisableFeatureCommand extends Command
      */
     public function handle()
     {
+
+        $this->call('feature:list');
+
         try {
             $featureName = $this->choice('Which feature would you like to turn off?', Feature::options(FeatureModel::ON));
 
@@ -45,7 +49,10 @@ public function handle()
         } catch (FeatureNotFoundException $exception) {
             $this->warn("Feature {$exception->featureName} could not be found");
         } catch (NoFeaturesException $exception) {
-            $this->call('feature:list');
+            $this->warn('Please define features in the config file');
+        } catch (NoToggableFeaturesException $exception){
+
         }
+
     }
 }
diff --git a/src/Commands/EnableFeatureCommand.php b/src/Commands/EnableFeatureCommand.php
@@ -5,6 +5,7 @@
 use Illuminate\Console\Command;
 use MatthiasWilbrink\FeatureToggle\Exceptions\FeatureNotFoundException;
 use MatthiasWilbrink\FeatureToggle\Exceptions\NoFeaturesException;
+use MatthiasWilbrink\FeatureToggle\Exceptions\NoToggableFeaturesException;
 use MatthiasWilbrink\FeatureToggle\Facades\Feature;
 use MatthiasWilbrink\FeatureToggle\Models\Feature as FeatureModel;
 
@@ -31,6 +32,9 @@ class EnableFeatureCommand extends Command
      */
     public function handle()
     {
+
+        $this->call('feature:list');
+
         try {
             $featureName = $this->choice('Which feature would you like to turn on?', Feature::options(FeatureModel::OFF));
 
@@ -45,7 +49,9 @@ public function handle()
         } catch (FeatureNotFoundException $exception) {
             $this->warn("Feature {$exception->featureName} could not be found");
         } catch (NoFeaturesException $exception) {
-           $this->call('feature:list');
+            $this->warn('Please define features in the config file');
+        }catch (NoToggableFeaturesException $exception){
+
         }
     }
 }
diff --git a/src/Commands/ListFeaturesCommand.php b/src/Commands/ListFeaturesCommand.php
@@ -28,14 +28,15 @@ class ListFeaturesCommand extends Command
      */
     public function handle()
     {
-        if (empty(Feature::allArray())) {
-            $this->call('feature:create');
-        }
 
-        if (empty(Feature::allArray())) {
+        $this->call('feature:create');
+
+        $featureArray = Feature::allArray();
+
+        if (empty($featureArray)) {
             $this->warn('Please define features in the config file');
         } else {
-            $this->table(['id', 'name', 'state', 'created_at', 'updated_at'], Feature::allArray());
+            $this->table(['id', 'name', 'state', 'created at', 'updated at'], $featureArray);
         }
 
     }

diff --git a/src/Exceptions/NoToggableFeaturesException.php b/src/Exceptions/NoToggableFeaturesException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace MatthiasWilbrink\FeatureToggle\Exceptions;
+
+class NoToggableFeaturesException extends \Exception
+{
+
+}
diff --git a/src/Managers/FeatureManager.php b/src/Managers/FeatureManager.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Config;
 use MatthiasWilbrink\FeatureToggle\Exceptions\FeatureNotFoundException;
 use MatthiasWilbrink\FeatureToggle\Exceptions\NoFeaturesException;
+use MatthiasWilbrink\FeatureToggle\Exceptions\NoToggableFeaturesException;
 use MatthiasWilbrink\FeatureToggle\Models\Feature;
 
 /**
@@ -139,12 +140,17 @@ public function allArray()
      * @param int $filter
      * @return array
      * @throws NoFeaturesException
+     * @throws NoToggableFeaturesException
      */
     public function options(int $filter)
     {
-        $options = $this->all()->where('state', $filter);
+        $options = $this->all();
         if ($options->isNotEmpty()) {
-            return $options->pluck('name')->toArray();
+            $options = $options->where('state', $filter);
+            if ($options->isNotEmpty()) {
+                return $options->pluck('name')->toArray();
+            }
+            throw new NoToggableFeaturesException();
         }
         throw new NoFeaturesException();
     }