[UPDATE] Support Lumen

flipboxstudio · Mar 4, 2017 · 2846b28 · 2846b28
1 parent c50722a
commit 2846b28
Show file tree

Hide file tree

Showing 11 changed files with 140 additions and 85 deletions.
diff --git a/composer.json b/composer.json
@@ -5,14 +5,17 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "denmasyarikin",
+            "name": "Denma Syarikin",
             "email": "[email protected]"
         }
     ],
     "require": {
         "php": ">=5.6.4",
-        "laravel/framework": "^5.2",
-        "doctrine/dbal": "v2.5.5"
+        "illuminate/config": "^5.2",
+        "illuminate/console": "^5.2",
+        "illuminate/database": "^5.2",
+        "illuminate/support": "^5.2",
+        "doctrine/dbal": "^2.5"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Flipbox/OrmManager/Config/orm.php b/src/Flipbox/OrmManager/Config/orm.php
@@ -5,11 +5,10 @@
 	|--------------------------------------------------------------------------
 	| Model Base Path
 	|--------------------------------------------------------------------------
-	| base path of models should be path of folder of model
-	| by default is app/
+	| base path of models
 	*/
 
-	'basepath' => app_path(),
+	'basepath' => 'app',
 
 	/*
 	|--------------------------------------------------------------------------

diff --git a/src/Flipbox/OrmManager/Consoles/ModelAutoConnect.php b/src/Flipbox/OrmManager/Consoles/ModelAutoConnect.php
@@ -4,7 +4,6 @@
 
 use Exception;
 use Illuminate\Support\Str;
-use Illuminate\Config\Repository;
 use Flipbox\OrmManager\ModelManager;
 use Illuminate\Database\Eloquent\Model;
 use Flipbox\OrmManager\DatabaseConnection;

diff --git a/src/Flipbox/OrmManager/Consoles/ModelBothConnect.php b/src/Flipbox/OrmManager/Consoles/ModelBothConnect.php
@@ -5,7 +5,6 @@
 use Exception;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use Illuminate\Config\Repository;
 use Flipbox\OrmManager\ModelManager;
 use Illuminate\Database\Eloquent\Model;
 use Flipbox\OrmManager\Exceptions\ModelNotFound;

diff --git a/src/Flipbox/OrmManager/Consoles/ModelConnect.php b/src/Flipbox/OrmManager/Consoles/ModelConnect.php
@@ -5,7 +5,6 @@
 use Exception;
 use Illuminate\Support\Str;
 use Illuminate\Console\Command;
-use Illuminate\Config\Repository;
 use Flipbox\OrmManager\ModelManager;
 use Illuminate\Database\Eloquent\Model;
 use Flipbox\OrmManager\DatabaseConnection;
@@ -20,20 +19,20 @@ class ModelConnect extends Command
         FontColor::paintString insteadof LocalComand;
     }
 
+    /**
+     * database
+     *
+     * @var DatabaseConnection
+     */
+    protected $db;
+
 	/**
 	 * model manager
 	 *
 	 * @var ModelManager
 	 */
 	protected $manager;
 
-    /**
-     * database
-     *
-     * @var ModelManager
-     */
-    protected $db;
-
     /**
      * The console command name.
      *
@@ -50,17 +49,19 @@ class ModelConnect extends Command
     protected $description = 'Generate connections method of class model';
 
     /**
-	 * Create a new ModelConnect instance.
-	 *
-	 * @param Repository $config
-	 * @return void
-	 */
-	public function __construct(Repository $config)
-	{
-		parent::__construct();
-		$this->db = new DatabaseConnection;
-		$this->manager = new ModelManager($config['orm'], $this->db);
-	}
+     * Create a new queue listen command.
+     *
+     * @param DatabaseConnection $db
+     * @param ModelManager $manager
+     * @return void
+     */
+    public function __construct(DatabaseConnection $db, ModelManager $manager)
+    {
+    	parent::__construct();
+
+        $this->db = $db;
+        $this->manager = $manager;
+    }
 
     /**
 	 * Execute the console command.

diff --git a/src/Flipbox/OrmManager/Consoles/ModelDetail.php b/src/Flipbox/OrmManager/Consoles/ModelDetail.php
@@ -2,9 +2,7 @@
 
 namespace Flipbox\OrmManager\Consoles;
 
-use ReflectionClass;
 use Illuminate\Console\Command;
-use Illuminate\Config\Repository;
 use Flipbox\OrmManager\ModelManager;
 use Illuminate\Database\Eloquent\Model;
 use Flipbox\OrmManager\DatabaseConnection;
@@ -17,18 +15,18 @@ class ModelDetail extends Command
     }
 
     /**
-     * model manager
+     * database
      *
-     * @var ModelManager
+     * @var DatabaseConnection
      */
-    protected $manager;
+    protected $db;
 
     /**
-     * database
+     * model manager
      *
      * @var ModelManager
      */
-    protected $db;
+    protected $manager;
 
     /**
      * The console command name.
@@ -47,14 +45,16 @@ class ModelDetail extends Command
     /**
      * Create a new queue listen command.
      *
+     * @param DatabaseConnection $db
+     * @param ModelManager $manager
      * @return void
      */
-    public function __construct(Repository $config)
+    public function __construct(DatabaseConnection $db, ModelManager $manager)
     {
         parent::__construct();
 
-        $this->db = new DatabaseConnection;
-        $this->manager = new ModelManager($config->get('orm'), $this->db);
+        $this->db = $db;
+        $this->manager = $manager;
     }
 
     /**

diff --git a/src/Flipbox/OrmManager/Consoles/ModelList.php b/src/Flipbox/OrmManager/Consoles/ModelList.php
@@ -4,15 +4,14 @@
 
 use Exception;
 use Illuminate\Console\Command;
-use Illuminate\Config\Repository;
 use Flipbox\OrmManager\ModelManager;
 use Flipbox\OrmManager\DatabaseConnection;
 use Flipbox\OrmManager\Consoles\Command as LocalComand;
 
 class ModelList extends Command
 {
     use LocalComand, FontColor {
-        FontColor::paintstring insteadof LocalComand;
+        FontColor::paintString insteadof LocalComand;
     }
 
 	/**
@@ -46,26 +45,29 @@ class ModelList extends Command
     /**
      * Create a new queue listen command.
      *
+     * @param DatabaseConnection $db
+     * @param ModelManager $manager
      * @return void
      */
-    public function __construct(Repository $config)
+    public function __construct(DatabaseConnection $db, ModelManager $manager)
     {
     	parent::__construct();
 
-        $this->db = new DatabaseConnection;
-    	$this->manager = new ModelManager($config->get('orm'), $this->db);
+        $this->db = $db;
+        $this->manager = $manager;
     }
 
     /**
-	 * Execute the console command.
-	 *
-	 * @return mixed
-	 */
-	public function handle()
-	{
-		try {
-			$models = $this->manager->toArray();
-		} catch (Exception $e) {
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        try {
+            $models = $this->manager->toArray();
+        } catch (Exception $e) {
+            dd($e);
 			return $this->error($e->getMessage());
 		}
 

diff --git a/src/Flipbox/OrmManager/DatabaseConnection.php b/src/Flipbox/OrmManager/DatabaseConnection.php
@@ -2,14 +2,22 @@
 
 namespace Flipbox\OrmManager;
 
-use DB;
 use Exception;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\Column;
 use Illuminate\Support\Collection;
+use Doctrine\DBAL\Driver\PDOException;
+use Illuminate\Database\DatabaseManager;
 
 class DatabaseConnection
 {
+	/**
+	 * database manager
+	 *
+	 * @var DatabaseManager
+	 */
+	protected $db;
+
 	/**
 	 * check connection
 	 *
@@ -36,8 +44,10 @@ class DatabaseConnection
 	 *
 	 * @return void
 	 */
-	public function __construct()
+	public function __construct(DatabaseManager $db)
 	{
+		$this->db = $db;
+
 		$this->initDoctrine();
 		$this->scanDatabase();
 	}
@@ -51,11 +61,14 @@ public function __construct()
 	protected function initDoctrine()
 	{
 		try {
-			$this->doctrine = DB::getDoctrineSchemaManager();
+			$this->doctrine = $this->db->getDoctrineSchemaManager();
+
 			$platform = $this->doctrine->getDatabasePlatform();
 			$platform->registerDoctrineTypeMapping('enum', 'string');
+
 			$this->connection = true;
-		} catch (Exception $e) {
+		} catch (PDOException $e) {
+			echo "{$e->getMessage()}\n";
 			$this->connection = false;
 		}
 	}

diff --git a/.../OrmManager/OrmManagerServiceProvider.php → ...box/OrmManager/LaravelServiceProvider.php b/.../OrmManager/OrmManagerServiceProvider.php → ...box/OrmManager/LaravelServiceProvider.php
@@ -2,10 +2,9 @@
 
 namespace Flipbox\OrmManager;
 
-use Flipbox\OrmManager\Console;
 use Illuminate\Support\ServiceProvider;
 
-class OrmManagerServiceProvider extends ServiceProvider
+class LaravelServiceProvider extends ServiceProvider
 {
 	/**
      * Perform post-registration booting of services.
@@ -24,22 +23,20 @@ public function register()
     {
         $this->mergeConfigFrom(__DIR__.'/Config/orm.php', 'orm');
 
-    	$this->registerCommand();
-    }
+        $this->app->singleton('orm.database', function ($app) {
+            return new DatabaseConnection($app['db']);
+        });
 
-    /**
-     * register commands
-     *
-     * @return void
-     */
-    protected function registerCommand()
-    {
-    	$this->commands([
+        $this->app->singleton('orm.manager', function ($app) {
+            return new ModelManager($app['config'], $app['orm.database']);
+        });
+
+        $this->commands([
             Consoles\ModelList::class,
-    		Consoles\ModelDetail::class,
+            Consoles\ModelDetail::class,
             Consoles\ModelConnect::class,
             Consoles\ModelBothConnect::class,
             Consoles\ModelAutoConnect::class,
-    	]);
+        ]);
     }
 }
diff --git a/src/Flipbox/OrmManager/LumenServiceProvider.php b/src/Flipbox/OrmManager/LumenServiceProvider.php
@@ -0,0 +1,40 @@
+<?php 
+
+namespace Flipbox\OrmManager;
+
+use Illuminate\Support\ServiceProvider;
+
+class LumenServiceProvider extends ServiceProvider
+{
+    /**
+     * Perform post-registration booting of services.
+     */
+    public function boot()
+    {
+        //
+    }
+
+    /**
+     * Register any application services.
+     */
+    public function register()
+    {
+        $this->mergeConfigFrom(__DIR__.'/Config/orm.php', 'orm');
+
+        $this->app->singleton('orm.database', function ($app) {
+            return new DatabaseConnection($app['db']);
+        });
+
+        $this->app->singleton('orm.manager', function ($app) {
+            return new ModelManager($app['config'], $app['orm.database']);
+        });
+
+        $this->commands([
+            Consoles\ModelList::class,
+            Consoles\ModelDetail::class,
+            Consoles\ModelConnect::class,
+            Consoles\ModelBothConnect::class,
+            Consoles\ModelAutoConnect::class,
+        ]);
+    }
+}