Merge pull request #2 from alighorbani1381/master

Use DRY (Don't Repat Yourself !)

Author: reziamini

src/Directives/Directive.php renamed to src/Contract/Directivable.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace EasyBlade\Directives;
+namespace EasyBlade\Contract;
 
-interface Directive
+interface Directivable
 {
     public static function handle($parameter);
 }

src/Directives/AssetDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class AssetDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class AssetDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/ConfigDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class ConfigDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class ConfigDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/CountDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class CountDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class CountDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/EndCountDirective.php renamed to src/Directives/EndConditionDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class EndCountDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class EndConditionDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/EndSessionDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class ImageDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class ImageDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/ImageDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class OldDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class OldDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/OldDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class RouteDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class RouteDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/RouteDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class ScriptDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class ScriptDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/ScriptDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class SessionDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class SessionDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/SessionDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class SessionExistsDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class SessionExistsDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/SessionExistsDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class StyleDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class StyleDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/StyleDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class UrlDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class UrlDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/UrlDirective.php

@@ -2,7 +2,9 @@
 
 namespace EasyBlade\Directives;
 
-class UserDirective implements Directive
+use EasyBlade\Contract\Directivable;
+
+class UserDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/UserDirective.php

@@ -2,9 +2,10 @@
 
 namespace EasyBlade\Directives;
 
+use EasyBlade\Contract\Directivable;
 use Illuminate\Support\Facades\Route;
 
-class isActiveDirective implements Directive
+class isActiveDirective implements Directivable
 {
     public static function handle($parameter)
     {

src/Directives/isActiveDirective.php

@@ -2,36 +2,38 @@
 
 namespace EasyBlade;
 
-use EasyBlade\Directives\AssetDirective;
-use EasyBlade\Directives\ConfigDirective;
-use EasyBlade\Directives\CountDirective;
-use EasyBlade\Directives\EndCountDirective;
-use EasyBlade\Directives\EndSessionDirective;
-use EasyBlade\Directives\ImageDirective;
-use EasyBlade\Directives\isActiveDirective;
-use EasyBlade\Directives\OldDirective;
-use EasyBlade\Directives\RouteDirective;
-use EasyBlade\Directives\ScriptDirective;
-use EasyBlade\Directives\SessionDirective;
-use EasyBlade\Directives\SessionExistsDirective;
-use EasyBlade\Directives\StyleDirective;
-use EasyBlade\Directives\UrlDirective;
-use EasyBlade\Directives\UserDirective;
+use EasyBlade\Directives\{
+    OldDirective,
+    UrlDirective,
+    UserDirective,
+    AssetDirective,
+    CountDirective,
+    ImageDirective,
+    RouteDirective,
+    StyleDirective,
+    ConfigDirective,
+    ScriptDirective,
+    SessionDirective,
+    isActiveDirective,
+    EndConditionDirective,
+    SessionExistsDirective
+};
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 
+
 class EasyBladeServiceProvider extends ServiceProvider
 {
-    const directives = [
+    const DIRECTIVES = [
         'route'            => RouteDirective::class,
         'url'              => UrlDirective::class,
         'asset'            => AssetDirective::class,
         'isActive'         => isActiveDirective::class,
         'count'            => CountDirective::class,
-        'endcount'         => EndCountDirective::class,
+        'endcount'         => EndConditionDirective::class,
         'user'             => UserDirective::class,
         'sessionExists'    => SessionExistsDirective::class,
-        'endsessionExists' => EndSessionDirective::class,
+        'endsessionExists' => EndConditionDirective::class,
         'session'          => SessionDirective::class,
         'image'            => ImageDirective::class,
         'style'            => StyleDirective::class,
@@ -47,8 +49,8 @@ public function boot()
 
     public function registerDirectives()
     {
-        foreach (static::directives as $directive => $class) {
+        foreach (static::DIRECTIVES as $directive => $class) {
             Blade::directive($directive, [$class, 'handle']);
         }
     }
-}
+}