Merge branch 'release/v2.1.0'

Omranic · Omranic · commit 61b42242fc41 · 2019-06-02T06:48:30.000+02:00
* release/v2.1.0:
  Bump version
  Tweak service provider publishes functionality and console tools
  Drop PHP 7.1 travis test
  Update composer deps
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-- 7.1
 - 7.2
 - 7.3
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 
 
+## [v2.1.0] - 2019-06-02
+- Update composer deps
+- Drop PHP 7.1 travis test
+- Tweak service provider publishes functionality and console tools
+
 ## [v2.0.0] - 2019-03-03
 - Rename environment variable QUEUE_DRIVER to QUEUE_CONNECTION
 - Require PHP 7.2 & Laravel 5.8
diff --git a/README.md b/README.md
@@ -4,7 +4,6 @@
 
 [![Packagist](https://img.shields.io/packagist/v/rinvex/laravel-widgets.svg?label=Packagist&style=flat-square)](https://packagist.org/packages/rinvex/laravel-widgets)
 [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/rinvex/laravel-widgets.svg?label=Scrutinizer&style=flat-square)](https://scrutinizer-ci.com/g/rinvex/laravel-widgets/)
-[![Code Climate](https://img.shields.io/codeclimate/github/rinvex/laravel-widgets.svg?label=CodeClimate&style=flat-square)](https://codeclimate.com/github/rinvex/laravel-widgets)
 [![Travis](https://img.shields.io/travis/rinvex/laravel-widgets.svg?label=TravisCI&style=flat-square)](https://travis-ci.org/rinvex/laravel-widgets)
 [![StyleCI](https://styleci.io/repos/98805007/shield)](https://styleci.io/repos/98805007)
 [![License](https://img.shields.io/packagist/l/rinvex/laravel-widgets.svg?label=License&style=flat-square)](https://github.com/rinvex/laravel-widgets/blob/develop/LICENSE)
diff --git a/composer.json b/composer.json
@@ -47,7 +47,7 @@
     "require-dev": {
         "codedungeon/phpunit-result-printer": "^0.26.0",
         "illuminate/container": "~5.8.0",
-        "phpunit/phpunit": "^8.0.0"
+        "phpunit/phpunit": "^8.1.0"
     },
     "autoload": {
         "files": [
diff --git a/src/Providers/WidgetsServiceProvider.php b/src/Providers/WidgetsServiceProvider.php
@@ -6,12 +6,15 @@
 
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
+use Rinvex\Support\Traits\ConsoleTools;
 use Rinvex\Widgets\Factories\WidgetFactory;
 use Illuminate\View\Compilers\BladeCompiler;
 use Rinvex\Widgets\Console\Commands\WidgetMakeCommand;
 
 class WidgetsServiceProvider extends ServiceProvider
 {
+    use ConsoleTools;
+
     /**
      * Register the service provider.
      *
@@ -26,7 +29,7 @@ public function register(): void
         $this->registerWidgetCollection();
 
         // Register console commands
-        ! $this->app->runningInConsole() || $this->registerCommands();
+        ! $this->app->runningInConsole() || $this->registerWidgetCommands();
     }
 
     /**
@@ -68,7 +71,8 @@ public function boot(Router $router): void
         $this->loadViewsFrom(__DIR__.'/../../resources/views', 'rinvex/widgets');
 
         // Publish Resources
-        ! $this->app->runningInConsole() || $this->publishResources();
+        ! $this->app->runningInConsole() || $this->publishesViews('rinvex/laravel-widgets');
+        ! $this->app->runningInConsole() || $this->publishesConfig('rinvex/laravel-widgets');
 
         // Register blade extensions
         $this->registerBladeExtensions();
@@ -100,23 +104,12 @@ protected function loadRoutes(Router $router): void
         }
     }
 
-    /**
-     * Publish resources.
-     *
-     * @return void
-     */
-    protected function publishResources(): void
-    {
-        $this->publishes([realpath(__DIR__.'/../../config/config.php') => config_path('rinvex.widgets.php')], 'rinvex-widgets-config');
-        $this->publishes([realpath(__DIR__.'/../../resources/views') => resource_path('views/vendor/rinvex/laravel-widgets')], 'rinvex-widgets-views');
-    }
-
     /**
      * Register console commands.
      *
      * @return void
      */
-    protected function registerCommands(): void
+    protected function registerWidgetCommands(): void
     {
         // Register artisan commands
         $this->app->singleton('command.rinvex.widgets.make', function ($app) {

-Original file line number
+Diff line change
@@ @@ -1,7 +1,6 @@ @@
 language: php
 php:
 -- 7.1
 - 7.2
 - 7.3