Merge pull request #56 from danielme85/v4

V4

Author: danielme85

phpunit.xml

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false"
-         colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <exclude>
-            <directory>./vendor</directory>
-        </exclude>
-    </coverage>
-    <testsuites>
-        <testsuite name="Test Suite danielme85/laravel-log-to-db">
-            <directory suffix=".php">./tests/</directory>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite danielme85/laravel-log-to-db">
+      <directory suffix=".php">./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

readme.md

@@ -21,8 +21,8 @@ Uses Laravel native logging functionality trough [Monolog](https://github.com/Se
 * [Local Testing With Docker](#local-testing-with-docker)
 
 
-> :warning: This project should be backwards compatible down to and including Laravel 5.6 and php 7.1.
-> <br>However testing of current version and main branch is currently only with php 8.1 and Laravel 9.
+> :warning: For Laravel version 10 and beyond, please use version 4 or later of this package. 
+> <br> For Laravel version 5.6 to 9, please use version 3.x.x.
 
 ## Installation
 Use the composer require or add to composer.json. 

tests/CustomEloquentModel.php

@@ -1,7 +1,5 @@
 <?php
 
-namespace danielme85\LaravelLogToDB\Tests;
-
 use danielme85\LaravelLogToDB\Models\LogToDbCreateObject;
 use Illuminate\Database\Eloquent\Model;
 
@@ -17,12 +15,4 @@ class CustomEloquentModel extends Model
     protected $connection = 'mysql';
     protected $table = 'log';
 
-    protected static function boot()
-    {
-        parent::boot();
-
-        static::created(function ($log) {
-             throw new \ErrorException($log->message);
-        });
-    }
 }

tests/LogToDbTest.php

@@ -1,13 +1,20 @@
 <?php
 
 use danielme85\LaravelLogToDB\LogToDB;
+use danielme85\LaravelLogToDB\LogToDbHandler;
 use danielme85\LaravelLogToDB\Models\DBLogException;
+use danielme85\LaravelLogToDB\Processors\PhpVersionProcessor;
+use Dotenv\Dotenv;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Queue;
 use danielme85\LaravelLogToDB\Jobs\SaveNewLogEvent;
 use Monolog\LogRecord;
+use Monolog\Processor\HostnameProcessor;
+use Monolog\Processor\MemoryUsageProcessor;
+use Orchestra\Testbench\TestCase;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
-class LogToDbTest extends Orchestra\Testbench\TestCase
+class LogToDbTest extends TestCase
 {
     /**
      * Setup the test environment.
@@ -37,7 +44,7 @@ protected function defineDatabaseMigrations()
      */
     protected function defineEnvironment($app)
     {
-        $dotenv = Dotenv\Dotenv::createImmutable(__DIR__.'/../', '.env.testing');
+        $dotenv = Dotenv::createImmutable(__DIR__.'/../', '.env.testing');
         $dotenv->load();
 
         $app['config']->set('database.default', 'mysql');
@@ -73,33 +80,33 @@ protected function defineEnvironment($app)
             ],
             'database' => [
                 'driver' => 'custom',
-                'via' => danielme85\LaravelLogToDB\LogToDbHandler::class,
+                'via' => LogToDbHandler::class,
                 'level' => 'debug',
                 'connection' => 'default',
                 'collection' => 'log',
                 'max_records' => 10,
                 'max_hours' => 1,
                 'processors' => [
-                    Monolog\Processor\HostnameProcessor::class,
-                    Monolog\Processor\MemoryUsageProcessor::class,
-                    danielme85\LaravelLogToDB\Processors\PhpVersionProcessor::class
+                    HostnameProcessor::class,
+                    MemoryUsageProcessor::class,
+                    PhpVersionProcessor::class
                 ]
             ],
             'mongodb' => [
                 'driver' => 'custom',
-                'via' => danielme85\LaravelLogToDB\LogToDbHandler::class,
+                'via' => LogToDbHandler::class,
                 'level' => 'debug',
                 'connection' => 'mongodb',
                 'collection' => 'log',
                 'max_records' => 10,
                 'max_hours' => 1,
                 'processors' => [
-                    Monolog\Processor\HostnameProcessor::class
+                    HostnameProcessor::class
                 ]
             ],
             'limited' => [
                 'driver' => 'custom',
-                'via' => danielme85\LaravelLogToDB\LogToDbHandler::class,
+                'via' => LogToDbHandler::class,
                 'level' => 'warning',
                 'detailed' => false,
                 'max_records' => false,
@@ -139,7 +146,7 @@ public function testClassInit()
         $this->assertInstanceOf(LogToDB::class, app('laravel-log-to-db'));
         $this->assertInstanceOf(LogToDB::class, new LogToDB());
 
-        //Class works, now let's cleanup possible failed test
+        //Class works, now lets cleanup possible failed test
         LogToDB::model()->truncate();
         LogToDB::model('mongodb')->truncate();
     }
@@ -220,7 +227,7 @@ public function testLoggingToChannels()
      */
     public function testException()
     {
-        $e = new Symfony\Component\HttpKernel\Exception\BadRequestHttpException("This is a fake 500 error", null, 500, ['fake-header' => 'value']);
+        $e = new BadRequestHttpException("This is a fake 500 error", null, 500, ['fake-header' => 'value']);
         Log::warning("Error", ['exception' => $e, 'more' => 'infohere']);
         $log = LogToDB::model()->where('message', 'Error')->first();
         $this->assertNotEmpty($log->context);
@@ -314,12 +321,12 @@ public function testSaveNewLogEventJob()
         $logToDb = new LogToDB();
         $record = new LogRecord(
             datetime: new \Monolog\DateTimeImmutable(true),
+            channel: 'local',
+            level: \Monolog\Level::Info,
             message: 'job-test',
             context: [],
-            level: \Monolog\Level::Info,
-            channel: 'local',
             extra: [],
-            formatted: "[2019-10-04T17:26:38.446827+00:00] local.INFO: test [] []\n"
+            formatted: "[2019-10-04T17:26:38.446827+00:00] local.INFO: test [] []\n",
         );
 
         $job = new SaveNewLogEvent($logToDb, $record);
@@ -451,7 +458,7 @@ public function testStandAloneModels()
      */
     public function testCustomModel()
     {
-        config()->set('logtodb.model', \danielme85\LaravelLogToDB\Tests\CustomEloquentModel::class);
+        config()->set('logtodb.model', CustomEloquentModel::class);
         Log::info('This is on a custom model class');
         $this->assertStringContainsString('This is on a custom model class', LogToDB::model()->latest('id')->first()->message);
     }