Updated Laravel legacy files

Author: Stolz

README.md

@@ -42,7 +42,7 @@ An ultra-simple-to-use assets management PHP library.
 <a id="frameworks"></a>
 ## Supported frameworks
 
-The library is framework agnostic and it should work well with any framework or naked PHP application. Nevertheless, since the library is most popular between Laravel users the following instructions have been tailored for **Laravel 5** framework ([still on Laravel 4?](https://github.com/Stolz/Assets/issues/55#issuecomment-73024822)). If you want to use the library in any other scenario please read the [non static interface](#nonstatic) instructions.
+The library is framework agnostic and it should work well with any framework or naked PHP application. Nevertheless, since the library is most popular between Laravel users the following instructions have been tailored for **Laravel 5** framework ([still on Laravel 4?](https://github.com/Stolz/Assets/issues/84#issuecomment-171149242)). If you want to use the library in any other scenario please read the [non static interface](#nonstatic) instructions.
 
 <a id="installation"></a>
 ## Installation

src/Laravel/FlushPipelineCommand.php

@@ -1,8 +1,8 @@
 <?php namespace Stolz\Assets\Laravel;
 
-use Config;
-use File;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Config\Repository as Config;
+use Illuminate\Filesystem\Filesystem;
 use Symfony\Component\Console\Input\InputOption;
 
 class FlushPipelineCommand extends Command
@@ -21,6 +21,28 @@ class FlushPipelineCommand extends Command
 	 */
 	protected $description = 'Flush assets pipeline files.';
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param \Illuminate\Contracts\Config\Repository $config
+	 * @param \Illuminate\Filesystem\Filesystem $filesystem
+	 *
+	 * @return void
+	 */
+	public function __construct()//Config $config, Filesystem $filesystem (See NOTE below)
+	{
+		parent::__construct();
+
+		// NOTE: Dependency injection for Artisan commands constructor was not introduced until Laravel 5.1 (LST).
+		// In order to keep compatibility with Laravel 5.0 we manually resolve the dependencies
+
+		//$this->config = $config;
+		//$this->filesystem = $filesystem;
+
+		$this->config = app(Config::class);
+		$this->filesystem = app(Filesystem::class);
+	}
+
 	/**
 	 * Execute the console command.
 	 *
@@ -39,7 +61,7 @@ public function fire()
 			foreach($directories as $dir)
 				$this->comment($dir);
 
-			if( ! $this->confirm('Do you wish to continue? [yes|no]'))
+			if( ! $this->confirm('Do you want to continue?'))
 				return;
 		}
 
@@ -50,9 +72,9 @@ public function fire()
 			$this->output->write("$dir ");
 
 			if($this->purgeDir($dir))
-				$this->info('Ok');
+				$this->info('OK');
 			else
-				$this->error('Error');
+				$this->error('ERROR');
 		}
 
 		$this->comment('Done!');
@@ -66,7 +88,7 @@ public function fire()
 	protected function getPipelineDirectories()
 	{
 		// Parse configured groups
-		$config = config('assets', []);
+		$config = $this->config->get('assets', []);
 		$groups = (isset($config['default'])) ? $config : ['default' => $config];
 		if( ! is_null($group = $this->option('group')))
 			$groups = array_only($groups, $group);
@@ -76,33 +98,40 @@ protected function getPipelineDirectories()
 		foreach($groups as $group => $config)
 		{
 			$pipelineDir = (isset($config['pipeline_dir'])) ? $config['pipeline_dir'] : 'min';
+			$publicDir = (isset($config['public_dir'])) ? $config['public_dir'] : public_path();
+			$publicDir = rtrim($publicDir, DIRECTORY_SEPARATOR);
 
 			$cssDir = (isset($config['css_dir'])) ? $config['css_dir'] : 'css';
-			$directories[] = public_path($cssDir . DIRECTORY_SEPARATOR . $pipelineDir);
-
+			$directories[] = implode(DIRECTORY_SEPARATOR, [$publicDir, $cssDir, $pipelineDir]);
 
 			$jsDir = (isset($config['js_dir'])) ? $config['js_dir'] : 'js';
-			$directories[] = public_path($jsDir . DIRECTORY_SEPARATOR . $pipelineDir);
+			$directories[] = implode(DIRECTORY_SEPARATOR, [$publicDir, $jsDir, $pipelineDir]);
 		}
 
-		return array_unique($directories);
+		// Clean results
+		$directories = array_unique($directories);
+		sort($directories);
+
+		return $directories;
 	}
 
 	/**
-	 * Purge directory.
+	 * Remove the contents of a given directory.
 	 *
 	 * @param  string $directory
+	 *
 	 * @return boolean
 	 */
 	protected function purgeDir($directory)
 	{
-		if( ! File::isDirectory($directory))
+		if( ! $this->filesystem->isDirectory($directory))
 			return true;
 
-		if(File::isWritable($directory))
-			return File::cleanDirectory($directory);
+		if($this->filesystem->isWritable($directory))
+			return $this->filesystem->cleanDirectory($directory);
 
 		$this->error($directory . ' is not writable');
+
 		return false;
 	}
 

src/Laravel/LegacyFlushPipelineCommand.php

@@ -0,0 +1,84 @@
+<?php namespace Stolz\Assets\Laravel;
+
+use Config;
+use File;
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+
+class LegacyFlushPipelineCommand extends Command
+{
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'asset:flush';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Flush assets pipeline files.';
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return void
+	 */
+	public function fire()
+	{
+		// Get directory paths
+		$pipeDir = Config::get('assets::pipeline_dir', 'min');
+		$cssDir = public_path(Config::get('assets::css_dir', 'css') . DIRECTORY_SEPARATOR . $pipeDir);
+		$jsDir = public_path(Config::get('assets::js_dir', 'js') . DIRECTORY_SEPARATOR . $pipeDir);
+
+		// Ask for confirmation
+		if( ! $this->option('force'))
+		{
+			$this->info(sprintf('All content of %s and %s will be deleted.', $cssDir, $jsDir));
+			if( ! $this->confirm('Do you wish to continue? [yes|no]'))
+				return;
+		}
+
+		// Purge assets
+		$purgeCss = $this->purgeDir($cssDir);
+		$purgeJs = $this->purgeDir($jsDir);
+
+		if( ! $purgeCss or ! $purgeJs)
+			return $this->error('Something went wrong');
+
+		$this->info('Done!');
+	}
+
+	/**
+	 * Purge directory.
+	 *
+	 * @param  string $directory
+	 * @return boolean
+	 */
+	protected function purgeDir($directory)
+	{
+		if( ! File::isDirectory($directory))
+			return true;
+
+		if(File::isWritable($directory))
+			return File::cleanDirectory($directory);
+
+		$this->error($directory . ' is not writable');
+
+		return false;
+	}
+
+	/**
+	 * Get the console command options.
+	 *
+	 * @return array
+	 */
+	protected function getOptions()
+	{
+		return array(
+			array('force', 'f', InputOption::VALUE_NONE, 'Do not prompt for confirmation'),
+		);
+	}
+}

src/Laravel/LegacyServiceProvider.php

@@ -44,7 +44,7 @@ public function register()
 
 		// Bind 'stolz.assets.command.flush' component to the IoC container
 		$this->app->bind('stolz.assets.command.flush', function ($app) {
-			return new FlushPipelineCommand();
+			return new LegacyFlushPipelineCommand();
 		});
 	}
 }