Update to support laravel 5.8 (#259)

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 ARCANEDEV <[email protected]> - LogViewer
+Copyright (c) 2015-2019 ARCANEDEV <[email protected]> - LogViewer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -23,7 +23,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LogViewer/rel
 ## Features
 
   - A great Log viewer API.
-  - Laravel `5.0` to `5.7` are supported.
+  - Laravel `5.0` to `5.8` are supported.
   - Ready to use (Views, Routes, controllers … Out of the box) [Note: No need to publish assets]
   - View, paginate, filter, download and delete logs.
   - Load a custom logs storage path.

_docs/0.Home.md

@@ -5,7 +5,7 @@ This package allows you to keep track of each one of your logs stored under `sto
 ## Features
 
   - A great Log viewer API.
-  - Laravel `5.0` to `5.7` are supported.
+  - Laravel `5.0` to `5.8` are supported.
   - Ready to use (Views, Routes, controllers … Out of the box) [Note: No need to publish assets]
   - View, paginate, filter, download and delete logs.
   - Load a custom logs storage path.

_docs/1.Installation-and-Setup.md

@@ -28,6 +28,7 @@ Laravel uses the [Monolog PHP logging library](https://github.com/Seldaek/monolo
 | ![LogViewer v4.4.x][log_viewer_4_4_x] | ![Laravel v5.5][laravel_5_5]                                                                                        |
 | ![LogViewer v4.5.x][log_viewer_4_5_x] | ![Laravel v5.6][laravel_5_6]                                                                                        |
 | ![LogViewer v4.6.x][log_viewer_4_6_x] | ![Laravel v5.7][laravel_5_7]                                                                                        |
+| ![LogViewer v4.7.x][log_viewer_4_7_x] | ![Laravel v5.8][laravel_5_8]                                                                                        |
 
 [laravel_5_0]:  https://img.shields.io/badge/v5.0-supported-brightgreen.svg?style=flat-square "Laravel v5.0"
 [laravel_5_1]:  https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1"
@@ -37,12 +38,14 @@ Laravel uses the [Monolog PHP logging library](https://github.com/Seldaek/monolo
 [laravel_5_5]:  https://img.shields.io/badge/v5.5-supported-brightgreen.svg?style=flat-square "Laravel v5.5"
 [laravel_5_6]:  https://img.shields.io/badge/v5.6-supported-brightgreen.svg?style=flat-square "Laravel v5.6"
 [laravel_5_7]:  https://img.shields.io/badge/v5.7-supported-brightgreen.svg?style=flat-square "Laravel v5.7"
+[laravel_5_8]:  https://img.shields.io/badge/v5.8-supported-brightgreen.svg?style=flat-square "Laravel v5.8"
 
 [log_viewer_4_2_x]: https://img.shields.io/badge/version-4.2.*-blue.svg?style=flat-square "LogViewer v4.2.*"
 [log_viewer_4_3_x]: https://img.shields.io/badge/version-4.3.*-blue.svg?style=flat-square "LogViewer v4.3.*"
 [log_viewer_4_4_x]: https://img.shields.io/badge/version-4.4.*-blue.svg?style=flat-square "LogViewer v4.4.*"
 [log_viewer_4_5_x]: https://img.shields.io/badge/version-4.5.*-blue.svg?style=flat-square "LogViewer v4.5.*"
 [log_viewer_4_6_x]: https://img.shields.io/badge/version-4.6.*-blue.svg?style=flat-square "LogViewer v4.6.*"
+[log_viewer_4_7_x]: https://img.shields.io/badge/version-4.7.*-blue.svg?style=flat-square "LogViewer v4.7.*"
 
 ## Composer
 

composer.json

@@ -16,13 +16,13 @@
     "require": {
         "php":               ">=7.1.3",
         "psr/log":           "~1.0",
-        "arcanedev/support": "~4.4.0"
+        "arcanedev/support": "~4.5.0"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.7.0",
+        "orchestra/testbench": "~3.8.0",
         "mockery/mockery":     "~1.0",
-        "phpunit/phpunit":     "~7.0",
-        "phpunit/phpcov":      "~5.0"
+        "phpunit/phpcov":      "~5.0|~6.0",
+        "phpunit/phpunit":     "~7.0|~8.0"
     },
     "autoload": {
         "psr-4": {

tests/Commands/ClearCommandTest.php

@@ -1,9 +1,6 @@
 <?php namespace Arcanedev\LogViewer\Tests\Commands;
 
-use Mockery;
 use Arcanedev\LogViewer\Tests\TestCase;
-use Arcanedev\LogViewer\Contracts\LogViewer;
-use Arcanedev\LogViewer\Commands\ClearCommand;
 
 /**
  * Class     ClearCommandTest
@@ -29,7 +26,7 @@ class ClearCommandTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -39,7 +36,7 @@ protected function setUp()
         $this->setupForTests();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         rmdir($this->path);
         unset($this->path);

tests/Commands/PublishCommandTest.php

@@ -15,14 +15,7 @@ class PublishCommandTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
-    {
-        parent::setUp();
-
-        //
-    }
-
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->deleteConfig();
         $this->deleteLocalizations();

tests/Entities/LogCollectionTest.php

@@ -24,14 +24,14 @@ class LogCollectionTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->logs = LogCollection::make();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->logs);
 
@@ -166,25 +166,21 @@ public function it_can_get_log_menu()
         }
     }
 
-    /**
-     * @test
-     *
-     * @expectedException        \Arcanedev\LogViewer\Exceptions\LogNotFoundException
-     * @expectedExceptionMessage Log not found in this date [2222-01-01]
-     */
+    /** @test */
     public function it_must_throw_a_log_not_found_on_get_method()
     {
+        $this->expectException(\Arcanedev\LogViewer\Exceptions\LogNotFoundException::class);
+        $this->expectExceptionMessage('Log not found in this date [2222-01-01]');
+
         $this->logs->get('2222-01-01');
     }
 
-    /**
-     * @test
-     *
-     * @expectedException        \Arcanedev\LogViewer\Exceptions\LogNotFoundException
-     * @expectedExceptionMessage Log not found in this date [2222-01-01]
-     */
+    /** @test */
     public function it_must_throw_a_log_not_found_on_log_method()
     {
+        $this->expectException(\Arcanedev\LogViewer\Exceptions\LogNotFoundException::class);
+        $this->expectExceptionMessage('Log not found in this date [2222-01-01]');
+
         $this->logs->log('2222-01-01');
     }
 }

tests/Entities/LogEntryCollectionTest.php

@@ -24,14 +24,14 @@ class LogEntryCollectionTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->entries = new LogEntryCollection;
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->entries);
 

tests/Entities/LogEntryTest.php

@@ -24,14 +24,14 @@ class LogEntryTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->entry = $this->getRandomLogEntry('2015-01-01');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->entry);
 

tests/Entities/LogTest.php

@@ -24,14 +24,14 @@ class LogTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->log = $this->getLog('2015-01-01');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->log);
 

tests/LogViewerServiceProviderTest.php

@@ -23,14 +23,14 @@ class LogViewerServiceProviderTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
         $this->provider = $this->app->getProvider(LogViewerServiceProvider::class);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         unset($this->provider);
 

tests/LogViewerTest.php

@@ -24,14 +24,14 @@ class LogViewerTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->logViewer = $this->app->make(\Arcanedev\LogViewer\Contracts\LogViewer::class);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->logViewer);
 

tests/Providers/CommandsServiceProviderTest.php

@@ -24,14 +24,14 @@ class CommandsServiceProviderTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->provider = $this->app->getProvider(CommandsServiceProvider::class);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->provider);
 

tests/Providers/UtilitiesServiceProviderTest.php

@@ -25,14 +25,14 @@ class UtilitiesServiceProviderTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->provider = $this->app->getProvider(UtilitiesServiceProvider::class);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->provider);
 

tests/RoutesTest.php

@@ -21,7 +21,7 @@ public function it_can_see_dashboard_page()
         $response = $this->get(route('log-viewer::dashboard'));
         $response->assertSuccessful();
 
-        static::assertContains(
+        static::assertStringContainsString(
             '<h1>Dashboard</h1>',
             $response->getContent()
         );
@@ -33,7 +33,7 @@ public function it_can_see_logs_page()
         $response = $this->get(route('log-viewer::logs.list'));
         $response->assertSuccessful();
 
-        static::assertContains(
+        static::assertStringContainsString(
             '<h1>Logs</h1>',
             $response->getContent()
         );
@@ -48,7 +48,7 @@ public function it_can_show_a_log_page()
         $response = $this->get(route('log-viewer::logs.show', [$date]));
         $response->assertSuccessful();
 
-        static::assertContains(
+        static::assertStringContainsString(
             "<h1>Log [{$date}]</h1>",
             $response->getContent()
         );
@@ -64,7 +64,7 @@ public function it_can_see_a_filtered_log_entries_page()
         $response = $this->get(route('log-viewer::logs.filter', [$date, $level]));
         $response->assertSuccessful();
 
-        static::assertContains(
+        static::assertStringContainsString(
             "<h1>Log [{$date}]</h1>",
             $response->getContent()
         );

tests/Tables/StatsTableTest.php

@@ -28,7 +28,7 @@ class StatsTableTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -38,7 +38,7 @@ protected function setUp()
         );
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->table);
 

tests/TestCase.php

@@ -36,14 +36,14 @@ abstract class TestCase extends BaseTestCase
      | -----------------------------------------------------------------
      */
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
 
         static::$logLevels = self::getLogLevels();
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         parent::tearDownAfterClass();
 

tests/Utilities/FactoryTest.php

@@ -24,14 +24,14 @@ class FactoryTest extends TestCase
      | -----------------------------------------------------------------
      */
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->logFactory = $this->app->make(\Arcanedev\LogViewer\Contracts\Utilities\Factory::class);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->logFactory);
 
@@ -225,13 +225,11 @@ public function it_can_check_is_not_empty()
         static::assertFalse($this->logFactory->isEmpty());
     }
 
-    /**
-     * @test
-     *
-     * @expectedException \Arcanedev\LogViewer\Exceptions\LogNotFoundException
-     */
+    /** @test */
     public function it_must_throw_a_filesystem_exception()
     {
+        $this->expectException(\Arcanedev\LogViewer\Exceptions\LogNotFoundException::class);
+
         $this->logFactory->get('2222-11-11'); // Future FTW
     }