move situations class

imanghafoori1 · Feb 23, 2019 · d3498e4 · d3498e4
1 parent 70b3d41
commit d3498e4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/Core/SituationsProxy.php → src/Core/Situations.php b/src/Core/SituationsProxy.php → src/Core/Situations.php
@@ -4,10 +4,15 @@
 
 use Imanghafoori\HeyMan\YouShouldHave;
 
-final class SituationsProxy
+final class Situations
 {
     public static $situations = [];
 
+    public static function add($situation): void
+    {
+        self::$situations[] = $situation;
+    }
+
     public static function call($method, $args)
     {
         $args = is_array($args[0]) ? $args[0] : $args;

diff --git a/src/HeyMan.php b/src/HeyMan.php
@@ -3,7 +3,7 @@
 namespace Imanghafoori\HeyMan;
 
 use Imanghafoori\HeyMan\Switching\Turn;
-use Imanghafoori\HeyMan\Core\SituationsProxy;
+use Imanghafoori\HeyMan\Core\Situations;
 use Imanghafoori\HeyMan\Conditions\ConditionsFacade;
 
 class HeyMan
@@ -24,7 +24,7 @@ public function __call($method, $args)
             resolve('heyman.chain')->set('debugInfo', $info);
         }
 
-        return  SituationsProxy::call($method, $args);
+        return  Situations::call($method, $args);
     }
 
     public function checkPoint(string $pointName)

diff --git a/src/HeyManServiceProvider.php b/src/HeyManServiceProvider.php
@@ -14,6 +14,7 @@
 use Imanghafoori\HeyMan\Conditions\Traits\Callbacks;
 use Imanghafoori\HeyMan\Conditions\Traits\Authentication;
 use Imanghafoori\HeyMan\Conditions\Traits\Gate as myGate;
+use Imanghafoori\HeyMan\Core\Situations;
 use Imanghafoori\HeyMan\Conditions\Traits\Session as mySession;
 use Imanghafoori\HeyMan\WatchingStrategies\Views\ViewSituationProvider;
 use Imanghafoori\HeyMan\WatchingStrategies\Events\EventSituationProvider;
@@ -22,7 +23,7 @@
 
 final class HeyManServiceProvider extends ServiceProvider
 {
-    public $providers = [
+    public $situationProviders = [
         ViewSituationProvider::class,
         RouteSituationProvider::class,
         EventSituationProvider::class,
@@ -40,14 +41,14 @@ public function boot()
 
         $this->registerConditions();
 
-        $this->registerSituationProviders($this->providers);
+        $this->registerSituationProviders($this->situationProviders);
     }
 
     public function register()
     {
         Singletons::make($this->app);
 
-        AliasLoader::getInstance()->alias('HeyMan', \Imanghafoori\HeyMan\Facades\HeyMan::class);
+        AliasLoader::getInstance()->alias('HeyMan', HeyMan::class);
 
         $this->mergeConfigFrom(__DIR__.'/../config/heyMan.php', 'heyMan');
     }
@@ -86,7 +87,7 @@ private function registerSituationProviders($providers)
         foreach ($providers as $provider) {
             $provider = new $provider;
             Consider::add($provider->getForgetKey(), $provider->getListener());
-            SituationsProxy::$situations[] = $provider->getSituationProvider();
+            Situations::add($provider->getSituationProvider());
         }
     }
 }