Reverted support for Laravel 4

Author: Stolz

README.md

@@ -44,7 +44,15 @@ To configure the package use the following command to copy the configuration fil
 
 All available settings are included inside `spy.php` and with the provided comments they should be self-explanatory.
 
+## Laravel 4
+
+If you are still using Laravel 4 instead of loading `Stolz\SchemaSpy\ServiceProvider` use `Stolz\SchemaSpy\LegacyServiceProvider` and manually copy the config file:
+
+	cp vendor/stolz/laravel-schema-spy/src/config.php app/config/spy.php
+
 ## License
 
 MIT License
-(c) [Stolz](https://github.com/Stolz)
+© [Stolz](https://github.com/Stolz)
+
+Read the provided `LICENSE` file for details.

src/Command.php

@@ -1,5 +1,6 @@
 <?php namespace Stolz\SchemaSpy;
 
+use Config;
 use Illuminate\Console\Command as ConsoleCommand;
 use Symfony\Component\Console\Input\InputArgument;
 
@@ -27,31 +28,43 @@ class Command extends ConsoleCommand
 	protected $parameters = [];
 
 	/**
-	 * Set parameters from config file
+	 * Set schemaspy command parameters.
 	 *
-	 * @return Command
+	 * @return array
 	 */
-	protected function setParametersFromConfig()
+	protected function setParameters()
 	{
-		// Set output dir parameter
-		$this->parameters['-o'] = config('spy.output', app_path('database/schema'));
+		$parameters = [];
+
+		// Set output directory
+		$parameters['-o'] = Config::get('spy.output', app_path('database/schema'));
 
-		// Set database connection parameters
-		$connections = config('database.connections', []);
-		$connection = ($this->argument('connection')) ?: config('database.default');
+		// Set database connection details
+		$connections = Config::get('database.connections', []);
+		$connection = ($this->argument('connection')) ?: Config::get('database.default');
 		if(isset($connections[$connection]))
 		{
 			$this->info("Using '$connection' connection");
 
-			$this->parameters['-host'] = $connections[$connection]['host'];
-			$this->parameters['-db']   = $connections[$connection]['database'];
-			$this->parameters['-u']    = $connections[$connection]['username'];
-			$this->parameters['-p']    = $connections[$connection]['password'];
+			$parameters['-host'] = $connections[$connection]['host'];
+			$parameters['-db']   = $connections[$connection]['database'];
+			$parameters['-u']    = $connections[$connection]['username'];
+			$parameters['-p']    = $connections[$connection]['password'];
 		}
 		else
 			$this->comment("Unknown connection '$connection'. Command will fail unless you provide DB credentials.");
 
-		return $this;
+		// Merge with user's parameters
+		$parameters = array_merge($parameters, Config::get('spy.parameters', []));
+
+		// Ask for missing mandatory parameters
+		if( ! isset($parameters['-db']))
+			$parameters['-db'] = $this->ask('Enter database name');
+
+		if( ! isset($parameters['-u']))
+			$parameters['-u'] = $this->ask('Enter database username');
+
+		return $this->parameters = $parameters;
 	}
 
 	/**
@@ -61,25 +74,19 @@ protected function setParametersFromConfig()
 	 */
 	public function fire()
 	{
-		// Merge automatic parameters with user configurable parameters
-		$this->parameters = array_merge($this->setParametersFromConfig()->parameters, config('spy.arguments', []));
-
-		// Ask for missing mandatory parameters
-		if( ! isset($this->parameters['-db']))
-			$this->parameters['-db'] = $this->ask('Enter database name');
-
-		if( ! isset($this->parameters['-u']))
-			$this->parameters['-u'] = $this->ask('Enter database username');
+		// Set schemaSpy parameters
+		$this->setParameters();
 
 		// Build command
-		$command = config('spy.command', 'java -jar schemaSpy.jar');
+		$command = Config::get('spy.command', 'java -jar schemaSpy.jar');
+
 		foreach($this->parameters as $key => $value)
 			$command .= " $key $value";
 
 		// Run command
 		exec($command, $output, $returnValue);
 
-		if($returnValue == 0)
+		if($returnValue === 0)
 			$this->info('Files successfully written to ' . $this->parameters['-o']);
 		else
 		{
@@ -97,8 +104,8 @@ public function fire()
 	 */
 	protected function getArguments()
 	{
-		return array(
-			array('connection', InputArgument::OPTIONAL, 'Database connection name'),
-		);
+		return [
+			['connection', InputArgument::OPTIONAL, 'Database connection name', Config::get('database.default')],
+		];
 	}
 }

src/LegacyServiceProvider.php

@@ -0,0 +1,31 @@
+<?php namespace Stolz\SchemaSpy;
+
+class LegacyServiceProvider extends \Illuminate\Support\ServiceProvider
+{
+	/**
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		// Bind 'stolz.schemaspy.command.spy' component to the IoC container
+		$this->app->bind('stolz.schemaspy.command.spy', function ($app) {
+			return new Command();
+		});
+
+		// Add artisan command
+		$this->commands('stolz.schemaspy.command.spy');
+	}
+
+	/**
+	 * Bootstrap the application events.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		//$this->package('stolz/spy', 'spy'); // Only valid if config file is at src/config/config.php
+		$this->app->config->package('stolz/spy', __DIR__, 'spy');
+	}
+}

src/config.php

@@ -21,7 +21,7 @@
 	 | Base command to run schemaSpy.jar on your system
 	 |--------------------------------------------------------------------------
 	 |
-	 | No parameters here, instead use 'arguments' array below!
+	 | No parameters here, instead use the 'parameters' array below!
 	 |
 	 | Default: java -jar schemaSpy.jar
 	 |
@@ -31,17 +31,17 @@
 
 	/*
 	|--------------------------------------------------------------------------
-	| Extra parametes to pass to the command
+	| Extra parameters to pass to the command
 	|--------------------------------------------------------------------------
 	|
-	| Database connection settings will be read form Laravel database config so
-	| there is no need to specify them here unless you want to override them.
+	| Database connection settings will be read form Laravel's database config
+	| file but they can be overridden here.
 	|
-	| Full list of possible arguments: http://schemaspy.sourceforge.net/
+	| Full list of possible parameters: http://schemaspy.sourceforge.net/
 	|
 	*/
 
-	'arguments' => [
+	'parameters' => [
 		'-t'  => 'mysql',
 		'-dp' => '/path/to/mysql-connector-java-5.1.30-bin.jar', // download from http://dev.mysql.com/downloads/connector/j/
 		'-hq' => null,