Merge pull request #3 from TerranetMD/master

PSR-4 and minor fixes

composer.json

@@ -23,8 +23,18 @@
         "psr-0": {
             "Terranet\\Options": "src/"
         },
+        "psr-4": {
+            "Terranet\\Options\\": "src/"
+        },
         "files": [
             "src/helpers.php"
         ]
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Terranet\\Options\\ServiceProvider"
+            ]
+        }
     }
 }

src/Terranet/Options/Console/OptionMakeCommand.php → src/Console/OptionMakeCommand.php

@@ -4,6 +4,8 @@
 
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Composer;
 use Symfony\Component\Console\Input\InputArgument;
 use Terranet\Options\Manager;
 
@@ -13,6 +15,32 @@ class OptionMakeCommand extends Command
 
     protected $description = 'Insert new option';
 
+    /**
+     * The filesystem instance.
+     *
+     * @var \Illuminate\Filesystem\Filesystem
+     */
+    protected $files;
+
+    /**
+     * @var \Illuminate\Support\Composer
+     */
+    protected $composer;
+
+    /**
+     * Create a new session table command instance.
+     *
+     * @param  \Illuminate\Filesystem\Filesystem $files
+     * @param  \Illuminate\Support\Composer   $composer
+     */
+    public function __construct(Filesystem $files, Composer $composer)
+    {
+        parent::__construct();
+
+        $this->files = $files;
+        $this->composer = $composer;
+    }
+
     public function handle()
     {
         $name = $this->argument('name');

src/Terranet/Options/Console/OptionRemoveCommand.php → src/Console/OptionRemoveCommand.php

@@ -3,6 +3,8 @@
 namespace Terranet\Options\Console;
 
 use Illuminate\Console\Command;
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Composer;
 use Symfony\Component\Console\Input\InputArgument;
 
 class OptionRemoveCommand extends Command
@@ -11,6 +13,32 @@ class OptionRemoveCommand extends Command
 
     protected $description = 'Remove an option';
 
+    /**
+     * The filesystem instance.
+     *
+     * @var \Illuminate\Filesystem\Filesystem
+     */
+    protected $files;
+
+    /**
+     * @var \Illuminate\Support\Composer
+     */
+    protected $composer;
+
+    /**
+     * Create a new session table command instance.
+     *
+     * @param  \Illuminate\Filesystem\Filesystem $files
+     * @param  \Illuminate\Support\Composer   $composer
+     */
+    public function __construct(Filesystem $files, Composer $composer)
+    {
+        parent::__construct();
+
+        $this->files = $files;
+        $this->composer = $composer;
+    }
+
     public function handle()
     {
         $name = $this->argument('name');

src/Terranet/Options/Console/OptionsTableCommand.php → src/Console/OptionsTableCommand.php

@@ -30,15 +30,15 @@ class OptionsTableCommand extends Command
     protected $files;
 
     /**
-     * @var \Illuminate\Foundation\Composer
+     * @var \Illuminate\Support\Composer
      */
     protected $composer;
 
     /**
      * Create a new session table command instance.
      *
      * @param  \Illuminate\Filesystem\Filesystem $files
-     * @param  \Illuminate\Foundation\Composer   $composer
+     * @param  \Illuminate\Support\Composer   $composer
      */
     public function __construct(Filesystem $files, Composer $composer)
     {
@@ -57,7 +57,7 @@ public function handle()
     {
         $fullPath = $this->createBaseMigration();
 
-        $this->files->put($fullPath, $this->files->get(__DIR__.'/stubs/options.stub'));
+        $this->files->put($fullPath, $this->files->get(__DIR__ . '/stubs/options.stub'));
 
         $this->info('Migration created successfully!');
 

src/Terranet/Options/Manager.php → src/Manager.php

@@ -29,9 +29,7 @@ public function createEloquentOptionsDriver()
 
     public function createDatabaseOptionsDriver()
     {
-        return new DatabaseOptionsDriver(
-            $this->app['db']->connection(),
-            'options'
-        );
+        $db = $this->container->get('db');
+        return new DatabaseOptionsDriver($db->connection(), 'options');
     }
 }

src/Terranet/Options/ServiceProvider.php → src/ServiceProvider.php

@@ -15,16 +15,16 @@ public function boot()
             define('_TERRANET_OPTIONS_', 1);
         }
 
-        $baseDir = realpath(__DIR__ . '/../../../');
-        $this->publishes(["{$baseDir}/src/routes.php" => app_path('Http/Terranet/Options/routes.php')], 'routes');
+        $baseDir = realpath(__DIR__ . '/');
+        $this->publishes(["{$baseDir}/routes.php" => app_path('Http/Terranet/Options/routes.php')], 'routes');
 
         if (! $this->app->routesAreCached()) {
             if (file_exists($routes = app_path('Http/Terranet/Options/routes.php'))) {
                 /** @noinspection PhpIncludeInspection */
                 require_once $routes;
             } else {
                 /** @noinspection PhpIncludeInspection */
-                require_once "{$baseDir}/src/routes.php";
+                require_once "{$baseDir}/routes.php";
             }
         }
     }