Merge pull request #10 from melihovv/laravel-7-support

Laravel 7 support

Author: melihovv

.coveralls.yml

@@ -0,0 +1,42 @@
+name: Run tests
+
+on:
+  push:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  php-tests:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        php: [7.4, 7.3, 7.2]
+        laravel: [7.*, 6.*]
+        dependency-version: [prefer-lowest, prefer-stable]
+        os: [ubuntu-latest, windows-latest]
+        include:
+          - laravel: 7.*
+            testbench: 5.*
+          - laravel: 6.*
+            testbench: 4.*
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v1
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+      - name: Execute tests
+        run: composer run phpunit

.github/workflows/default.yml

@@ -1,9 +1 @@
-preset: recommended
-enabled:
-  - concat_with_spaces
-disabled:
-  - align_double_arrow
-  - phpdoc_to_comment
-  - phpdoc_var_without_name
-  - concat_without_spaces
-  - no_multiline_whitespace_around_double_arrow
+preset: laravel

.styleci.yml

@@ -1,9 +1,8 @@
 Laravel log viewer
 ==================
 
-[![Build Status](https://travis-ci.org/melihovv/laravel-log-viewer.svg?branch=master)](https://travis-ci.org/melihovv/laravel-log-viewer)
+![GitHub Workflow Status](https://img.shields.io/github/workflow/status/melihovv/laravel-log-viewer/run-php-tests?label=Tests)
 [![styleci](https://styleci.io/repos/78041678/shield)](https://styleci.io/repos/78041678)
-[![Coverage Status](https://coveralls.io/repos/github/melihovv/laravel-log-viewer/badge.svg?branch=master)](https://coveralls.io/github/melihovv/laravel-log-viewer?branch=master)
 
 [![Packagist](https://img.shields.io/packagist/v/melihovv/laravel-log-viewer.svg)](https://packagist.org/packages/melihovv/laravel-log-viewer)
 [![Packagist](https://poser.pugx.org/melihovv/laravel-log-viewer/d/total.svg)](https://packagist.org/packages/melihovv/laravel-log-viewer)
@@ -28,23 +27,23 @@ composer require melihovv/laravel-log-viewer
 ```
 
 Add a route in your web routes file:
-```php 
-Route::get('logs', '\Melihovv\LaravelLogViewer\LaravelLogViewerController@index');
+```php
+Route::get('logs', '\Melihovv\LaravelLogViewer\Controller@index');
 ```
 
-Go to `http://myapp/logs`
+Go to `http://localhost:8000/logs`
 
 Additional
 ----------
 
 Publish package config if you want customize default values
 ```
-php artisan vendor:publish --tag=config
+php artisan vendor:publish --provider="Melihovv\LaravelLogViewerController\ServiceProvider" --tag=config
 ```
 
 If you want customize package view
 ```
-php artisan vendor:publish --tag=views
+php artisan vendor:publish --provider="Melihovv\LaravelLogViewerController\ServiceProvider" --tag=views
 ```
 
 ## Security

.travis.yml

@@ -19,22 +19,28 @@
   ],
   "require": {
     "php": ">=7.2",
-    "illuminate/filesystem": "^6.0",
-    "illuminate/support": "^6.0"
+    "ext-fileinfo": "*",
+    "illuminate/config": "^6.0|^7.0",
+    "illuminate/filesystem": "^6.0|^7.0",
+    "illuminate/http": "^6.0|^7.0",
+    "illuminate/routing": "^6.0|^7.0",
+    "illuminate/support": "^6.0|^7.0",
+    "illuminate/view": "^6.0|^7.0"
   },
   "require-dev": {
-    "mockery/mockery": "^1.0",
-    "orchestra/testbench": "^4.0",
-    "phpunit/phpunit": "^8.0"
+    "mockery/mockery": "^1.3",
+    "orchestra/testbench": "^4.0|^5.0",
+    "orchestra/testbench-browser-kit": "^4.0|^5.0",
+    "phpunit/phpunit": "^8.4|^9.0"
   },
   "autoload": {
     "psr-4": {
-      "Melihovv\\LaravelLogViewer\\": "src/LaravelLogViewer"
+      "Melihovv\\LaravelLogViewer\\": "src"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Melihovv\\LaravelLogViewer\\Tests\\": "tests/"
+      "Melihovv\\LaravelLogViewer\\Tests\\": "tests"
     }
   },
   "scripts": {
@@ -43,7 +49,7 @@
   "extra": {
     "laravel": {
       "providers": [
-        "Melihovv\\LaravelLogViewer\\LaravelLogViewerServiceProvider"
+        "Melihovv\\LaravelLogViewer\\ServiceProvider"
       ]
     }
   },

README.md

@@ -0,0 +1,48 @@
+<?php
+
+namespace Melihovv\LaravelLogViewer;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
+use InvalidArgumentException;
+
+class Controller
+{
+    public function index(Request $request)
+    {
+        $viewer = app('log-viewer');
+        $error = false;
+
+        try {
+            if ($request->has('file')) {
+                $viewer->setCurrentFile(base64_decode($request->get('file')));
+
+                if ($request->has('download')) {
+                    return Response::download($viewer->getCurrentFile());
+                }
+
+                if ($request->has('delete')) {
+                    File::delete($viewer->getCurrentFile());
+
+                    return Response::redirectTo($request->url());
+                }
+            } elseif ($request->has('dir')) {
+                $viewer->setCurrentDirectory(base64_decode($request->get('dir')));
+            }
+        } catch (InvalidArgumentException $e) {
+            $error = true;
+        }
+
+        return View::make('log-viewer::log', [
+            'logs' => $viewer->getLogsFromCurrentFile(),
+            'dirItems' => $viewer->getCurrentDirectoryContent(),
+            'currentFile' => $viewer->getCurrentFileRelativeToBaseDir(),
+            'parentDirPath' => $viewer->getRelativePathToCurrentDirectoryParent(),
+            'isCurrentDirectoryBase' => $viewer->isCurrentDirectoryBase(),
+            'parentDirs' => $viewer->getParentDirectories(),
+            'error' => $error,
+        ]);
+    }
+}

composer.json

@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Facades\Facade;
 
-class LaravelLogViewer extends Facade
+class LogViewer extends Facade
 {
     protected static function getFacadeAccessor()
     {