Merge pull request #128 from ARCANEDEV/update-cleaning_package

Cleaning the package for Laravel 5.4 projects
ARCANEDEV · Jan 31, 2017 · 5de56ce · 5de56ce
2 parents 0145537 + b89a489
commit 5de56ce
Show file tree

Hide file tree

Showing 24 changed files with 99 additions and 92 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php":               ">=5.6",
         "psr/log":           "~1.0",
-        "arcanedev/support": "~3.20"
+        "arcanedev/support": "~4.0"
     },
     "require-dev": {
         "phpunit/phpcov":    "~3.0",

diff --git a/src/Commands/CheckCommand.php b/src/Commands/CheckCommand.php
@@ -1,5 +1,7 @@
 <?php namespace Arcanedev\LogViewer\Commands;
 
+use Arcanedev\LogViewer\Contracts\Utilities\LogChecker as LogCheckerContract;
+
 /**
  * Class     PublishCommand
  *
@@ -33,8 +35,19 @@ class CheckCommand extends Command
      */
     protected $signature = 'log-viewer:check';
 
-    /** @var \Arcanedev\LogViewer\Contracts\Utilities\LogChecker */
-    private $checker;
+    /* ------------------------------------------------------------------------------------------------
+     |  Getter & Setters
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Get the Log Checker instance.
+     *
+     * @return \Arcanedev\LogViewer\Contracts\Utilities\LogChecker
+     */
+    protected function getChecker()
+    {
+        return $this->laravel[LogCheckerContract::class];
+    }
 
     /* ------------------------------------------------------------------------------------------------
      |  Main Functions
@@ -46,19 +59,20 @@ class CheckCommand extends Command
     public function handle()
     {
         $this->displayLogViewer();
-
-        $this->checker = $this->laravel['arcanedev.log-viewer.checker'];
-
         $this->displayRequirements();
         $this->displayMessages();
     }
 
+    /* ------------------------------------------------------------------------------------------------
+     |  Other Functions
+     | ------------------------------------------------------------------------------------------------
+     */
     /**
      * Display LogViewer requirements.
      */
     private function displayRequirements()
     {
-        $requirements = $this->checker->requirements();
+        $requirements = $this->getChecker()->requirements();
 
         $this->frame('Application requirements');
 
@@ -74,7 +88,7 @@ private function displayRequirements()
      */
     private function displayMessages()
     {
-        $messages = $this->checker->messages();
+        $messages = $this->getChecker()->messages();
 
         $rows = [];
         foreach ($messages['files'] as $file => $message) {

diff --git a/src/Commands/Command.php b/src/Commands/Command.php
@@ -53,7 +53,7 @@ protected function displayLogViewer()
         $this->line('');
 
         // Copyright
-        $this->comment('Version ' . $this->logViewer->version() . ' - Created by ARCANEDEV' . chr(169));
+        $this->comment('Version '.$this->logViewer->version().' - Created by ARCANEDEV'.chr(169));
         $this->line('');
     }
 }
diff --git a/src/Commands/PublishCommand.php b/src/Commands/PublishCommand.php
@@ -51,14 +51,10 @@ public function handle()
         ];
 
         if ((bool) $this->option('force')) {
-            $args['--force']    = true;
+            $args['--force'] = true;
         }
 
-        $tag = $this->option('tag');
-
-        if ( ! is_null($tag)) {
-            $args['--tag'] = version_compare(laravel_version(), '5.1.0', '>=') ? [$tag] : $tag;
-        }
+        $args['--tag'] = [$this->option('tag')];
 
         $this->displayLogViewer();
         $this->call('vendor:publish', $args);

diff --git a/src/Entities/LogCollection.php b/src/Entities/LogCollection.php
@@ -31,7 +31,7 @@ class LogCollection extends Collection
      */
     public function __construct($items = [])
     {
-        $this->setFilesystem(app('arcanedev.log-viewer.filesystem'));
+        $this->setFilesystem(app(FilesystemContract::class));
 
         parent::__construct($items);
 

diff --git a/src/Entities/LogEntry.php b/src/Entities/LogEntry.php
@@ -201,10 +201,10 @@ public function isSameLevel($level)
     public function toArray()
     {
         return [
-            'level'     => $this->level,
-            'datetime'  => $this->datetime->format('Y-m-d H:i:s'),
-            'header'    => $this->header,
-            'stack'     => $this->stack
+            'level'    => $this->level,
+            'datetime' => $this->datetime->format('Y-m-d H:i:s'),
+            'header'   => $this->header,
+            'stack'    => $this->stack
         ];
     }
 
@@ -257,7 +257,7 @@ public function hasStack()
      */
     private function cleanHeader($header)
     {
-        return preg_replace('/\[' . REGEX_DATETIME_PATTERN . '\][ ]/', '', $header);
+        return preg_replace('/\['.REGEX_DATETIME_PATTERN.'\][ ]/', '', $header);
     }
 
     /**
@@ -269,6 +269,6 @@ private function cleanHeader($header)
      */
     private function extractDatetime($header)
     {
-        return preg_replace('/^\[(' . REGEX_DATETIME_PATTERN . ')\].*/', '$1', $header);
+        return preg_replace('/^\[('.REGEX_DATETIME_PATTERN.')\].*/', '$1', $header);
     }
 }
diff --git a/src/Facades/LogMenu.php b/src/Facades/LogMenu.php
@@ -1,5 +1,6 @@
 <?php namespace Arcanedev\LogViewer\Facades;
 
+use Arcanedev\LogViewer\Contracts\Utilities\LogMenu as LogMenuContract;
 use Illuminate\Support\Facades\Facade;
 
 /**
@@ -15,5 +16,5 @@ class LogMenu extends Facade
      *
      * @return string
      */
-    protected static function getFacadeAccessor() { return 'arcanedev.log-viewer.menu'; }
+    protected static function getFacadeAccessor() { return LogMenuContract::class; }
 }
diff --git a/src/Facades/LogStyler.php b/src/Facades/LogStyler.php
@@ -1,5 +1,6 @@
 <?php namespace Arcanedev\LogViewer\Facades;
 
+use Arcanedev\LogViewer\Contracts\Utilities\LogStyler as LogStylerContract;
 use Illuminate\Support\Facades\Facade;
 
 /**
@@ -15,5 +16,5 @@ class LogStyler extends Facade
      *
      * @return string
      */
-    protected static function getFacadeAccessor() { return 'arcanedev.log-viewer.styler'; }
+    protected static function getFacadeAccessor() { return LogStylerContract::class; }
 }
diff --git a/src/Facades/LogViewer.php b/src/Facades/LogViewer.php
@@ -1,5 +1,6 @@
 <?php namespace Arcanedev\LogViewer\Facades;
 
+use Arcanedev\LogViewer\Contracts\LogViewer as LogViewerContract;
 use Illuminate\Support\Facades\Facade;
 
 /**
@@ -15,5 +16,5 @@ class LogViewer extends Facade
      *
      * @return string
      */
-    protected static function getFacadeAccessor() { return 'arcanedev.log-viewer'; }
+    protected static function getFacadeAccessor() { return LogViewerContract::class; }
 }
diff --git a/src/Http/Controllers/Controller.php b/src/Http/Controllers/Controller.php
@@ -30,7 +30,7 @@ abstract class Controller extends IlluminateController
      */
     public function __construct()
     {
-        $this->logViewer = app('arcanedev.log-viewer');
+        $this->logViewer = app(\Arcanedev\LogViewer\Contracts\LogViewer::class);
     }
 
     /* ------------------------------------------------------------------------------------------------

diff --git a/src/Http/Routes/LogViewerRoute.php b/src/Http/Routes/LogViewerRoute.php
@@ -1,7 +1,6 @@
 <?php namespace Arcanedev\LogViewer\Http\Routes;
 
-use Arcanedev\Support\Bases\RouteRegister;
-use Illuminate\Contracts\Routing\Registrar as Router;
+use Arcanedev\Support\Routing\RouteRegistrar;
 
 /**
  * Class     LogViewerRoute
@@ -11,18 +10,16 @@
  *
  * @codeCoverageIgnore
  */
-class LogViewerRoute extends RouteRegister
+class LogViewerRoute extends RouteRegistrar
 {
     /* ------------------------------------------------------------------------------------------------
      |  Main Functions
      | ------------------------------------------------------------------------------------------------
      */
     /**
      * Map all routes.
-     *
-     * @param  \Illuminate\Contracts\Routing\Registrar  $router
      */
-    public function map(Router $router)
+    public function map()
     {
         $this->get('/', [
             'as'    => 'log-viewer::dashboard',
@@ -41,9 +38,7 @@ public function map(Router $router)
      */
     private function registerLogsRoutes()
     {
-        $this->group([
-            'prefix' => 'logs',
-        ], function() {
+        $this->prefix('logs')->group(function() {
             $this->get('/', [
                 'as'    => 'log-viewer::logs.list',
                 'uses'  => 'LogViewerController@listLogs',
@@ -63,9 +58,7 @@ private function registerLogsRoutes()
      */
     private function registerSingleLogRoutes()
     {
-        $this->group([
-            'prefix'    => '{date}',
-        ], function() {
+        $this->prefix('{date}')->group(function() {
             $this->get('/', [
                 'as'    => 'log-viewer::logs.show',
                 'uses'  => 'LogViewerController@show',

diff --git a/src/LogViewerServiceProvider.php b/src/LogViewerServiceProvider.php
@@ -71,7 +71,6 @@ public function boot()
     public function provides()
     {
         return [
-            'arcanedev.log-viewer',
             Contracts\LogViewer::class,
         ];
     }
@@ -86,7 +85,6 @@ public function provides()
     private function registerLogViewer()
     {
         $this->singleton(Contracts\LogViewer::class, LogViewer::class);
-        $this->singleton('arcanedev.log-viewer', Contracts\LogViewer::class);
 
         // Registering the Facade
         $this->alias(

diff --git a/src/Providers/UtilitiesServiceProvider.php b/src/Providers/UtilitiesServiceProvider.php
@@ -3,6 +3,7 @@
 use Arcanedev\LogViewer\Contracts;
 use Arcanedev\LogViewer\Utilities;
 use Arcanedev\Support\ServiceProvider;
+use Illuminate\Support\Arr;
 
 /**
  * Class     UtilitiesServiceProvider
@@ -37,17 +38,11 @@ public function register()
     public function provides()
     {
         return [
-            'arcanedev.log-viewer.levels',
             Contracts\Utilities\LogLevels::class,
-            'arcanedev.log-viewer.styler',
             Contracts\Utilities\LogStyler::class,
-            'arcanedev.log-viewer.menu',
             Contracts\Utilities\LogMenu::class,
-            'arcanedev.log-viewer.filesystem',
             Contracts\Utilities\Filesystem::class,
-            'arcanedev.log-viewer.factory',
             Contracts\Utilities\Factory::class,
-            'arcanedev.log-viewer.checker',
             Contracts\Utilities\LogChecker::class,
         ];
     }
@@ -71,8 +66,6 @@ private function registerLogLevels()
 
             return new Utilities\LogLevels($translator, $config->get('log-viewer.locale'));
         });
-
-        $this->singleton('arcanedev.log-viewer.levels', Contracts\Utilities\LogLevels::class);
     }
 
     /**
@@ -81,7 +74,6 @@ private function registerLogLevels()
     private function registerStyler()
     {
         $this->singleton(Contracts\Utilities\LogStyler::class, Utilities\LogStyler::class);
-        $this->singleton('arcanedev.log-viewer.styler', Contracts\Utilities\LogStyler::class);
     }
 
     /**
@@ -90,7 +82,6 @@ private function registerStyler()
     private function registerLogMenu()
     {
         $this->singleton(Contracts\Utilities\LogMenu::class, Utilities\LogMenu::class);
-        $this->singleton('arcanedev.log-viewer.menu', Contracts\Utilities\LogMenu::class);
     }
 
     /**
@@ -107,16 +98,16 @@ private function registerFilesystem()
             $files      = $app['files'];
             $filesystem = new Utilities\Filesystem($files, $config->get('log-viewer.storage-path'));
 
+            $pattern = $config->get('log-viewer.pattern', []);
+
             $filesystem->setPattern(
-                $config->get('log-viewer.pattern.prefix',    Utilities\Filesystem::PATTERN_PREFIX),
-                $config->get('log-viewer.pattern.date',      Utilities\Filesystem::PATTERN_DATE),
-                $config->get('log-viewer.pattern.extension', Utilities\Filesystem::PATTERN_EXTENSION)
+                Arr::get($pattern, 'prefix', Utilities\Filesystem::PATTERN_PREFIX),
+                Arr::get($pattern, 'date', Utilities\Filesystem::PATTERN_DATE),
+                Arr::get($pattern, 'extension', Utilities\Filesystem::PATTERN_EXTENSION)
             );
 
             return $filesystem;
         });
-
-        $this->singleton('arcanedev.log-viewer.filesystem', Contracts\Utilities\Filesystem::class);
     }
 
     /**
@@ -125,7 +116,6 @@ private function registerFilesystem()
     private function registerFactory()
     {
         $this->singleton(Contracts\Utilities\Factory::class, Utilities\Factory::class);
-        $this->singleton('arcanedev.log-viewer.factory', Contracts\Utilities\Factory::class);
     }
 
     /**
@@ -134,6 +124,5 @@ private function registerFactory()
     private function registerChecker()
     {
         $this->singleton(Contracts\Utilities\LogChecker::class, Utilities\LogChecker::class);
-        $this->singleton('arcanedev.log-viewer.checker', Contracts\Utilities\LogChecker::class);
     }
 }
diff --git a/tests/LogViewerServiceProviderTest.php b/tests/LogViewerServiceProviderTest.php
@@ -58,7 +58,6 @@ public function it_can_be_instantiated()
     public function it_can_provides()
     {
         $expected = [
-            'arcanedev.log-viewer',
             \Arcanedev\LogViewer\Contracts\LogViewer::class,
         ];
 

diff --git a/tests/LogViewerTest.php b/tests/LogViewerTest.php
@@ -26,7 +26,7 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->logViewer = $this->app['arcanedev.log-viewer'];
+        $this->logViewer = $this->app->make(\Arcanedev\LogViewer\Contracts\LogViewer::class);
     }
 
     public function tearDown()

diff --git a/tests/Providers/UtilitiesServiceProviderTest.php b/tests/Providers/UtilitiesServiceProviderTest.php
@@ -60,17 +60,11 @@ public function it_can_be_instantiated()
     public function it_can_provides()
     {
         $expected = [
-            'arcanedev.log-viewer.levels',
             Contracts\Utilities\LogLevels::class,
-            'arcanedev.log-viewer.styler',
             Contracts\Utilities\LogStyler::class,
-            'arcanedev.log-viewer.menu',
             Contracts\Utilities\LogMenu::class,
-            'arcanedev.log-viewer.filesystem',
             Contracts\Utilities\Filesystem::class,
-            'arcanedev.log-viewer.factory',
             Contracts\Utilities\Factory::class,
-            'arcanedev.log-viewer.checker',
             Contracts\Utilities\LogChecker::class,
         ];
 

diff --git a/tests/RoutesTest.php b/tests/RoutesTest.php
@@ -19,7 +19,8 @@ public function it_can_see_dashboard_page()
     {
         $response = $this->route('GET', 'log-viewer::dashboard');
 
-        $this->assertResponseOk();
+        $response->isOk();
+
         $this->assertContains(
             '<h1 class="page-header">Dashboard</h1>',
             $response->getContent()