Added new tests, updated composer.json and added auto-discovery

This bump is because it took really long time to find suitable packages
for PHP 5.6.

.gitignore

@@ -0,0 +1 @@
+vendor

.travis.yml

@@ -0,0 +1,20 @@
+language: php
+php:
+  - 7.0
+  - 7.1
+  - nightly
+matrix:
+  allow_failures:
+    - php: nightly
+  fast_finish: true
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+before_script:
+  - phpenv global "$TRAVIS_PHP_VERSION"
+  - composer config extra.platform.php $TRAVIS_PHP_VERSION
+install:
+  - flags="--ansi --prefer-dist --no-interaction --optimize-autoloader --no-suggest --no-progress"
+  - travis_wait 30 composer install $flags
+script:
+  - ./vendor/bin/phpunit -c phpunit.xml

CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## 0.0.1 - 2017-02-07
+## [1.2.0](https://github.com/superhelio/commands/tree/1.2.0) (2017-10-19)
-### Added
+- Bumped PHP version requirement to >=7.0, PHP5.6 was taking really long time to resolve
+- Included composer.lock, which is generated with PHP v7.0.23
+
+## [1.1.2](https://github.com/superhelio/commands/tree/1.1.2) (2017-09-15)
+- Removed composer.lock, only to enable correct CI builds
+- Reworked travis-ci.org configuration, builds should now go green
+
+## [1.1.1](https://github.com/superhelio/commands/tree/1.1.1) (2017-08-27)
+- Typo fixes
+- Removal of dead/unnecessary code
+- Added composer.lock for faster builds
+
+## [1.1.0](https://github.com/superhelio/commands/tree/1.1.0) (2017-08-27)
+- New command: `superhelio:gozer` with tests
+
+## [1.0.0](https://github.com/superhelio/commands/tree/1.0.0) (2017-02-08)
+- Fixed Scrutinizer reported issue
+- Renamed LICENSE
+- Tested `github_changelog_generator`, but did not like it
+
+## [0.0.1](https://github.com/superhelio/commands/tree/0.0.1) (2017-02-07)
 - `superhelio:reload`

README.md

@@ -10,6 +10,8 @@
 This is a collection of Laravel Artisan commands created to help everyone
 in their development work. We try to keep these as useful as possible.
 
+This package requires PHP 7.0 or later. `composer.lock` has been generated with PHP v7.0.23.
+
 ## Install
 
 ### Step 1: Install Through Composer
@@ -33,6 +35,9 @@ public function register()
 
 ## Usage
 
+- *superhelio:gozer*
+    - Force delete database tables that have your table prefix
+    - `php artisan superhelio:gozer`
 - *superhelio:reload*
     - Reset database, migrate and seed
     - `php artisan superhelio:reload`
@@ -47,10 +52,6 @@ Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recen
 $ composer test
 ```
 
-## Contributing
-
-Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
-
 ## Security
 
 If you discover any security related issues, please contact [SuperHelio](link-author).
@@ -77,4 +78,5 @@ The MIT License (MIT). Please see [License File](LICENSE.md) for more informatio
 [link-code-quality]: https://scrutinizer-ci.com/g/superhelio/commands
 [link-downloads]: https://packagist.org/packages/superhelio/commands
 [link-author]: https://github.com/superhelio
-[link-contributors]: ../../contributors
+[link-contributors]: https://github.com/superhelio/commands/graphs/contributors
+[link-dbal]: https://packagist.org/packages/doctrine/dbal

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "superhelio/commands",
-    "description": "Laravel Commands",
+    "description": "This is a collection of Laravel Artisan commands created to help everyone in their development work.",
     "keywords": [
         "laravel",
         "superhelio",
@@ -17,11 +17,13 @@
         }
     ],
     "require": {
-        "php" : ">=5.5.0",
+        "php" : ">=7.0",
-        "illuminate/support": "~5.2"
+        "illuminate/support": "^5.3|^5.4|^5.5",
+        "doctrine/dbal": "^2.5|^2.6"
     },
     "require-dev": {
-        "phpunit/phpunit" : "4.*"
+        "phpunit/phpunit" : "^5.0",
+        "orchestra/testbench": "~3.0"
     },
     "autoload": {
         "psr-4": {
@@ -30,7 +32,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Superhelio\\Commands\\Test\\": "tests"
+            "Superhelio\\Commands\\Tests\\": "tests"
         }
     },
     "scripts": {
@@ -39,6 +41,11 @@
     "extra": {
         "branch-alias": {
             "dev-master": "1.0-dev"
+        },
+        "laravel": {
+            "providers": [
+                "Superhelio\\Commands\\ServiceProvider"
+            ]
         }
     }
 }

phpunit.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false">
+
+    <testsuites>
+        <testsuite name="Superhelio\Commands Test Suite">
+            <directory suffix="Test.php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="APP_ENV" value="testing"/>
+    </php>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="false">
+            <directory suffix=".php">src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>

src/Commands/Gozer.php

@@ -0,0 +1,194 @@
+<?php
+
+namespace Superhelio\Commands\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class Gozer extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'superhelio:gozer';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Force delete database tables that have your table prefix';
+
+    /**
+     * @var string Database table prefix
+     */
+    private $dbPrefix = '';
+
+    /**
+     * Execute the console command.
+     *
+     * @return bool
+     */
+    public function handle()
+    {
+        if (!class_exists('\\Doctrine\\DBAL\\Schema\\Schema')) {
+            $this->error('You are missing doctrine/dbal, you should add it to your project:');
+            $this->info('composer require doctrine/dbal');
+
+            return false;
+        }
+
+        $this->info('
+
+  ________
+ /  _____/  ____________ ___________ 
+/   \  ___ /  _ \___   // __ \_  __ \
+\    \_\  (  <_> )    /\  ___/|  | \/
+ \______  /\____/_____ \\___  >__|
+        \/            \/    \/
+
+');
+
+        $this->setDatabasePrefix($this->getDatabasePrefix());
+
+        $confirmationQuestion = 'Delete all of your database tables?';
+        if (!empty($this->dbPrefix)) {
+            $confirmationQuestion = sprintf(
+                'Delete your tables that begin with %s*',
+                $this->dbPrefix
+            );
+        }
+
+        if ($this->confirm($confirmationQuestion)) {
+            $connection = $this->getConnection();
+            $tables = $this->getTables($connection);
+
+            /**
+             * Reject tables that do not have specified table prefix.
+             * We would not want to destroy other tables that might
+             * be in the same database, in "homestead" for example.
+             *
+             * @var \Illuminate\Support\Collection $tables
+             */
+            $tables = $this->getFilteredTables($tables);
+
+            /**
+             * Check that we got at least one table, bail out if not
+             */
+            if ($tables->count() < 1) {
+                $this->info('There are no tables, only Zuul.');
+
+                return true;
+            }
+
+            /**
+             * Bid your farewells to these tables.
+             * Last look and confirmation.
+             */
+            $this->info(sprintf(
+                "Tables found:\n - %s",
+                implode(",\n - ", $tables->toArray())
+            ));
+            $this->line('');
+
+            /**
+             * Last confirmation before dropping tables
+             */
+            if ($this->confirm('Really delete those tables?')) {
+
+                /** Fancy pants progress bar to see your tables get destroyed */
+                $bar = $this->output->createProgressBar($tables->count());
+
+                Schema::disableForeignKeyConstraints();
+                $tables->each(function ($table) use ($bar, $connection) {
+
+                    /** Drop the table */
+                    $connection->dropTable($table);
+
+                    /** Advance our progress bar */
+                    $bar->advance();
+
+                });
+                Schema::enableForeignKeyConstraints();
+
+                /** Progress bar is now finished */
+                $bar->finish();
+            }
+
+            $this->line('');
+            $this->line('');
+        }
+
+        $this->info('Done.');
+
+        return true;
+    }
+
+    /**
+     * @return bool|\Doctrine\DBAL\Schema\AbstractSchemaManager
+     */
+    public function getConnection()
+    {
+        try {
+            /** @var \Doctrine\DBAL\Schema\AbstractSchemaManager $connection */
+            $connection = app('db')->connection()->getDoctrineSchemaManager();
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+
+            return false;
+        }
+
+        return $connection;
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $connection
+     *
+     * @return array|bool
+     */
+    public function getTables(\Doctrine\DBAL\Schema\AbstractSchemaManager $connection)
+    {
+        try {
+            /** @var array $tables */
+            $tables = $connection->listTableNames();
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+
+            return false;
+        }
+
+        return $tables;
+    }
+
+    public function getDatabasePrefix()
+    {
+        return trim(DB::getTablePrefix());
+    }
+
+    /**
+     * This is mainly for testing purposes
+     *
+     * @param string $prefix
+     */
+    public function setDatabasePrefix($prefix = '')
+    {
+        $this->dbPrefix = $prefix;
+    }
+
+    /**
+     * @param array $tables
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public function getFilteredTables($tables = [])
+    {
+        $prefix = $this->dbPrefix;
+
+        return collect($tables)->reject(function ($table) use ($prefix) {
+            return !starts_with($table, $prefix);
+        });
+    }
+}

src/Commands/Reload.php

@@ -11,24 +11,16 @@ class Reload extends Command
      *
      * @var string
      */
-    protected $signature = 'superhelio:reload';
+    protected $signature = 'superhelio:reload
+        {--automate=false : Should run without questions?}
+        {--loud=true : Should output reset and migrate outputs?}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Delete database tables, migrate and run seeds';
+    protected $description = 'Rollback migrations, migrate and run seeds';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
 
     /**
      * Execute the console command.
@@ -37,24 +29,51 @@ class Reload extends Command
      */
     public function handle()
     {
-        if ($this->confirm('Rollback all your database tables, recreate them and seed?')) {
+        $automated = $this->automate();
-            $this->call(
+
-                'migrate:reset',
+        if ($automated && $this->confirm('Rollback all your database tables, recreate them and seed?')) {
-                [
+            return $this->runReload();
-                    '--no-interaction' => true,
+        }
-                    '--env' => 'development',
+        if (!$automated) {
-                    '--verbose' => 3
+            return $this->runReload();
-                ]
-            );
-            $this->call(
-                'migrate',
-                [
-                    '--seed' => true,
-                    '--no-interaction' => true,
-                    '--env' => 'development',
-                    '--verbose' => 3
-                ]
-            );
         }
     }
+
+    public function automate()
+    {
+        $automate = $this->option('automate');
+
+        return !($automate === '1' || $automate === 1 || $automate === 'yes' || $automate === 'true');
+    }
+
+    public function outputVerbosity()
+    {
+        $output = $this->option('loud');
+
+        return ($output === '1' || $output === 1 || $output == 'yes' || $output == 'true');
+    }
+
+    public function runReload()
+    {
+        $verbose = ($this->outputVerbosity() ? 3 : 0);
+        $this->call(
+            'migrate:reset',
+            [
+                '--no-interaction' => true,
+                '--env' => 'development',
+                '--verbose' => $verbose
+            ]
+        );
+        $this->call(
+            'migrate',
+            [
+                '--seed' => true,
+                '--no-interaction' => true,
+                '--env' => 'development',
+                '--verbose' => $verbose
+            ]
+        );
+
+        return true;
+    }
 }

src/Facade.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Superhelio\Commands;
 
 class Facade extends \Illuminate\Support\Facades\Facade

src/ServiceProvider.php

@@ -30,6 +30,7 @@ class ServiceProvider extends BaseServiceProvider
     public function register()
     {
         $this->registerReloader();
+        $this->registerGozer();
     }
 
     private function registerReloader()
@@ -39,4 +40,12 @@ class ServiceProvider extends BaseServiceProvider
         });
         $this->commands('command.superhelio.reload');
     }
+
+    private function registerGozer()
+    {
+        $this->app->singleton('command.superhelio.gozer', function ($app) {
+            return $app['Superhelio\Commands\Commands\Gozer'];
+        });
+        $this->commands('command.superhelio.gozer');
+    }
 }

tests/GozerTest.php

@@ -0,0 +1,132 @@
+<?php
+
+namespace Superhelio\Commands;
+
+use ReflectionClass;
+use Superhelio\Commands\Commands\Gozer;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\DB;
+
+class GozerTest extends \Orchestra\Testbench\TestCase
+{
+    /**
+     * Setup the test environment.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->artisan('migrate', ['--database' => 'testbench']);
+    }
+
+    /**
+     * Define environment setup.
+     *
+     * @param  \Illuminate\Foundation\Application $app
+     *
+     * @return void
+     */
+    protected function getEnvironmentSetUp($app)
+    {
+        // Setup default database to use sqlite :memory:
+        $app['config']->set('database.default', 'testbench');
+        $app['config']->set('database.connections.testbench', [
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'prefix' => 'gozerTest__',
+        ]);
+    }
+
+    /**
+     * Get package providers.
+     * At a minimum this is the package being tested, but also
+     * would include packages upon which our package depends.
+     * In a normal app environment these would be added to
+     * the 'providers' array in the config/app.php file.
+     *
+     * @param  \Illuminate\Foundation\Application $app
+     *
+     * @return array
+     */
+    protected function getPackageProviders($app)
+    {
+        return [
+            '\Superhelio\Commands\Tests\Stubs\ServiceProvider',
+            '\Superhelio\Commands\ServiceProvider'
+        ];
+    }
+
+    public function test_database_is_there_and_functions()
+    {
+        DB::table('users')->insert([
+            'name' => 'User name',
+            'email' => 'hello@gozer.dev',
+            'password' => bcrypt('123')
+        ]);
+
+        $users = DB::table('users')->where('id', '=', 1)->first();
+        $this->assertEquals('hello@gozer.dev', $users->email);
+        $this->assertEquals('User name', $users->name);
+        $this->assertTrue(Hash::check('123', $users->password));
+    }
+
+    public function test_dbal_is_installed()
+    {
+        $this->assertTrue(class_exists('\\Doctrine\\DBAL\\Schema\\Schema'));
+    }
+
+    public function test_gozer_is_installed()
+    {
+        $this->assertTrue(class_exists('\\Superhelio\\Commands\\Commands\\Gozer'));
+    }
+
+    public function test_gozer_has_required_methods_and_properties()
+    {
+        $gozer = new ReflectionClass('\\Superhelio\\Commands\\Commands\\Gozer');
+        $this->assertTrue($gozer->hasMethod('handle'));
+        $this->assertTrue($gozer->hasProperty('signature'));
+        $this->assertTrue($gozer->hasProperty('description'));
+        $this->assertTrue($gozer->hasProperty('dbPrefix'));
+    }
+
+    public function test_gozer_finds_database_prefix()
+    {
+        $gozer = new Gozer();
+
+        $this->assertEquals('gozerTest__', $gozer->getDatabasePrefix());
+    }
+
+    public function test_gozer_finds_users_table()
+    {
+        $gozer = new Gozer();
+
+        $connection = $gozer->getConnection();
+
+        $tables = $gozer->getTables($connection);
+        $this->assertTrue(\in_array('gozerTest__users', $tables, false));
+
+        $gozer->setDatabasePrefix('gozerTest__');
+        $filteredTables = $gozer->getFilteredTables($tables);
+        $this->assertTrue(is_a($filteredTables, \Illuminate\Support\Collection::class));
+        $this->assertTrue(\in_array('gozerTest__users', $filteredTables->toArray(), false));
+    }
+
+    public function test_gozer_table_filtering_works()
+    {
+        $gozer = new Gozer();
+        $tables = array(
+            'gozerTest__users',
+            'gozerTest__migrations',
+            'this_should_be_filtered',
+            'filter_me_too'
+        );
+
+        $gozer->setDatabasePrefix('gozerTest__');
+        $filtered = $gozer->getFilteredTables($tables);
+        $array = $filtered->toArray();
+
+        $this->assertFalse(\in_array('this_should_be_filtered', $array, false));
+        $this->assertFalse(\in_array('filter_me_too', $array, false));
+        $this->assertTrue(\in_array('gozerTest__users', $array, false));
+        $this->assertTrue(\in_array('gozerTest__migrations', $array, false));
+    }
+}

tests/PackageTest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Superhelio\Commands;
+
+use ReflectionClass;
+
+class PackageTest extends \Orchestra\Testbench\TestCase
+{
+    public function test_facade()
+    {
+        $facade = new ReflectionClass(Facade::class);
+        $this->assertTrue($facade->hasMethod('getFacadeAccessor'));
+        $this->assertTrue($facade->getMethod('getFacadeAccessor')->isProtected());
+        $this->assertTrue($facade->getMethod('getFacadeAccessor')->isStatic());
+    }
+
+    public function test_service_provider()
+    {
+        $sp = new ReflectionClass(\Superhelio\Commands\ServiceProvider::class);
+        $this->assertTrue($sp->hasMethod('register'));
+        $this->assertTrue($sp->hasMethod('registerReloader'));
+        $this->assertTrue($sp->hasMethod('registerGozer'));
+    }
+}

tests/ReloadTest.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace Superhelio\Commands;
+
+use ReflectionClass;
+use Superhelio\Commands\Commands\Reload;
+
+class ReloadTest extends \Orchestra\Testbench\TestCase
+{
+    /**
+     * Setup the test environment.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->artisan('migrate', ['--database' => 'testbench']);
+    }
+
+    /**
+     * Define environment setup.
+     *
+     * @param  \Illuminate\Foundation\Application $app
+     *
+     * @return void
+     */
+    protected function getEnvironmentSetUp($app)
+    {
+        // Setup default database to use sqlite :memory:
+        $app['config']->set('database.default', 'testbench');
+        $app['config']->set('database.connections.testbench', [
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'prefix' => 'reloadTest__',
+        ]);
+    }
+
+    /**
+     * Get package providers.
+     * At a minimum this is the package being tested, but also
+     * would include packages upon which our package depends.
+     * In a normal app environment these would be added to
+     * the 'providers' array in the config/app.php file.
+     *
+     * @param  \Illuminate\Foundation\Application $app
+     *
+     * @return array
+     */
+    protected function getPackageProviders($app)
+    {
+        return [
+            '\Superhelio\Commands\Tests\Stubs\ServiceProvider',
+            '\Superhelio\Commands\ServiceProvider'
+        ];
+    }
+
+    public function test_reload_exists()
+    {
+        $this->assertTrue(class_exists(Reload::class));
+        $reload = new Reload();
+
+        $this->assertInstanceOf(Reload::class, $reload);
+    }
+
+    public function test_reload_has_required_methods_and_properties()
+    {
+        $reload = new Reload();
+        $this->assertTrue(method_exists($reload, 'handle'), 'handle');
+        $this->assertTrue(method_exists($reload, 'runReload'), 'runReload');
+        $this->assertTrue(method_exists($reload, 'automate'), 'automate');
+
+        $reload = new ReflectionClass(Reload::class);
+        $this->assertTrue($reload->hasProperty('signature'), 'signature');
+        $this->assertTrue($reload->hasProperty('description'), 'description');
+    }
+}

tests/Stubs/ServiceProvider.php

@@ -0,0 +1,10 @@
+<?php
+namespace Superhelio\Commands\Tests\Stubs;
+
+class ServiceProvider extends \Illuminate\Support\ServiceProvider
+{
+    public function boot()
+    {
+        $this->loadMigrationsFrom(\dirname(__DIR__) . '/migrations');
+    }
+}

tests/migrations/2014_10_12_000000_create_users_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('users', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('email')->unique();
+            $table->string('password');
+            $table->rememberToken();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('users');
+    }
+}