cleanup

amethyst-php · Jul 23, 2018 · 0c6ae4e · 0c6ae4e
1 parent 9570575
commit 0c6ae4e
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 42 deletions.
diff --git a/config/ore.tax.php b/config/ore.tax.php
@@ -1,7 +1,6 @@
 <?php
 
 return [
-
     /*
     |--------------------------------------------------------------------------
     | Table
@@ -13,14 +12,23 @@
     'table' => 'ore_taxes',
 
     'attributes' => [
-
     ],
 
-    'router' => [
-        'prefix'      => '/admin/taxes',
-        'middlewares' => [
-            \Railken\LaraOre\RequestLoggerMiddleware::class,
-            'auth:api',
+    /*
+    |--------------------------------------------------------------------------
+    | Http configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the routes
+    |
+    */
+    'http' => [
+        'admin' => [
+            'enabled'    => true,
+            'controller' => Railken\LaraOre\Http\Controllers\Admin\TaxesController::class,
+            'router'     => [
+                'prefix'      => '/admin/taxes',
+            ],
         ],
     ],
 ];
diff --git a/.../2018_06_04_100000_create_taxes_table.php → .../0000_00_00_000000_create_taxes_table.php b/.../2018_06_04_100000_create_taxes_table.php → .../0000_00_00_000000_create_taxes_table.php
@@ -9,8 +9,6 @@ class CreateTaxesTable extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up()
     {
@@ -26,8 +24,6 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down()
     {

diff --git a/src/Http/Controllers/TaxesController.php → ...ttp/Controllers/Admin/TaxesController.php b/src/Http/Controllers/TaxesController.php → ...ttp/Controllers/Admin/TaxesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Railken\LaraOre\Http\Controllers;
+namespace Railken\LaraOre\Http\Controllers\Admin;
 
 use Illuminate\Support\Facades\Config;
 use Railken\LaraOre\Api\Http\Controllers\RestController;

diff --git a/src/Tax/TaxFaker.php b/src/Tax/TaxFaker.php
@@ -2,8 +2,8 @@
 
 namespace Railken\LaraOre\Tax;
 
-use Railken\Bag;
 use Faker\Factory;
+use Railken\Bag;
 use Railken\Laravel\Manager\BaseFaker;
 
 class TaxFaker extends BaseFaker
@@ -21,7 +21,7 @@ public function parameters()
         $faker = Factory::create();
 
         $bag = new Bag();
-        $bag->set('name', "VAT 22%");
+        $bag->set('name', 'VAT 22%');
         $bag->set('description', $faker->realText);
         $bag->set('calculator', 'x*0.22');
 

diff --git a/src/TaxServiceProvider.php b/src/TaxServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Railken\LaraOre;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 use Railken\LaraOre\Api\Support\Router;
@@ -10,8 +11,6 @@ class TaxServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
     public function boot()
     {
@@ -27,8 +26,6 @@ public function boot()
 
     /**
      * Register any application services.
-     *
-     * @return void
      */
     public function register()
     {
@@ -39,19 +36,21 @@ public function register()
 
     /**
      * Load routes.
-     *
-     * @return void
      */
     public function loadRoutes()
     {
-        Router::group(array_merge(Config::get('ore.tax.router'), [
-            'namespace' => 'Railken\LaraOre\Http\Controllers',
-        ]), function ($router) {
-            $router->get('/', ['uses' => 'TaxesController@index']);
-            $router->post('/', ['uses' => 'TaxesController@create']);
-            $router->put('/{id}', ['uses' => 'TaxesController@update']);
-            $router->delete('/{id}', ['uses' => 'TaxesController@remove']);
-            $router->get('/{id}', ['uses' => 'TaxesController@show']);
-        });
+        $config = Config::get('ore.tax.http.admin');
+
+        if (Arr::get($config, 'enabled')) {
+            Router::group('admin', Arr::get($config, 'router'), function ($router) use ($config) {
+                $controller = Arr::get($config, 'controller');
+
+                $router->get('/', ['uses' => $controller.'@index']);
+                $router->post('/', ['uses' => $controller.'@create']);
+                $router->put('/{id}', ['uses' => $controller.'@update']);
+                $router->delete('/{id}', ['uses' => $controller.'@remove']);
+                $router->get('/{id}', ['uses' => $controller.'@show']);
+            });
+        }
     }
 }
diff --git a/tests/Tax/ApiTest.php b/tests/Tax/ApiTest.php
@@ -17,13 +17,11 @@ class ApiTest extends BaseTest
      */
     public function getBaseUrl()
     {
-        return Config::get('ore.api.router.prefix').Config::get('ore.tax.router.prefix');
+        return Config::get('ore.api.router.prefix').Config::get('ore.tax.http.admin.router.prefix');
     }
 
     /**
      * Test common requests.
-     *
-     * @return void
      */
     public function testSuccessCommon()
     {

diff --git a/tests/Tax/BaseTest.php b/tests/Tax/BaseTest.php
@@ -2,17 +2,8 @@
 
 namespace Railken\LaraOre\Tests\Tax;
 
-use Railken\Bag;
-
 abstract class BaseTest extends \Orchestra\Testbench\TestCase
 {
-    protected function getPackageProviders($app)
-    {
-        return [
-            \Railken\LaraOre\TaxServiceProvider::class,
-        ];
-    }
-
     /**
      * Setup the test environment.
      */
@@ -27,4 +18,11 @@ public function setUp()
         $this->artisan('vendor:publish', ['--provider' => 'Railken\LaraOre\TaxServiceProvider', '--force' => true]);
         $this->artisan('migrate');
     }
+
+    protected function getPackageProviders($app)
+    {
+        return [
+            \Railken\LaraOre\TaxServiceProvider::class,
+        ];
+    }
 }
diff --git a/tests/Tax/ManagerTest.php b/tests/Tax/ManagerTest.php
@@ -3,8 +3,8 @@
 namespace Railken\LaraOre\Tests\Tax;
 
 use Railken\LaraOre\Support\Testing\ManagerTestableTrait;
-use Railken\LaraOre\Tax\TaxManager;
 use Railken\LaraOre\Tax\TaxFaker;
+use Railken\LaraOre\Tax\TaxManager;
 
 class ManagerTest extends BaseTest
 {