Merge branch 'json-resource-wrapping-behaviour' of github.com:opcodes…

…io/log-viewer into json-resource-wrapping-behaviour
opcodesio · Sep 22, 2023 · 1c8dfe8 · 1c8dfe8
2 parents 8fd4e22 + aedc572
commit 1c8dfe8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/routes/api.php b/routes/api.php
@@ -8,7 +8,7 @@
 
 Route::middleware([
     ForwardRequestToHostMiddleware::class,
-    JsonResourceWithoutWrappingMiddleware::class
+    JsonResourceWithoutWrappingMiddleware::class,
 ])->group(function () {
     Route::get('folders', 'FoldersController@index')->name('log-viewer.folders');
     Route::get('folders/{folderIdentifier}/download', 'FoldersController@download')->name('log-viewer.folders.download');

diff --git a/src/LogFile.php b/src/LogFile.php
@@ -14,8 +14,8 @@
 
 class LogFile
 {
-    use Concerns\LogFile\HasMetadata;
     use Concerns\LogFile\CanCacheData;
+    use Concerns\LogFile\HasMetadata;
 
     public string $path;
     public string $name;

diff --git a/src/LogIndex.php b/src/LogIndex.php
@@ -8,11 +8,11 @@
 
 class LogIndex
 {
-    use Concerns\LogIndex\HasMetadata;
     use Concerns\LogIndex\CanCacheIndex;
     use Concerns\LogIndex\CanFilterIndex;
     use Concerns\LogIndex\CanIterateIndex;
     use Concerns\LogIndex\CanSplitIndexIntoChunks;
+    use Concerns\LogIndex\HasMetadata;
     use Concerns\LogIndex\PreservesIndexingProgress;
 
     const DEFAULT_CHUNK_SIZE = 50_000;

diff --git a/src/Readers/BaseLogReader.php b/src/Readers/BaseLogReader.php
@@ -9,8 +9,8 @@
 
 abstract class BaseLogReader
 {
-    use Concerns\LogReader\KeepsInstances;
     use Concerns\LogReader\KeepsFileHandle;
+    use Concerns\LogReader\KeepsInstances;
 
     protected LogFile $file;