Merge old master into main

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to `ignition` will be documented in this file
 
+## 2.11.3 - 2021-08-16
+
+- fix issues with circular dependencies in model route parameters (#408)
+- remove notice about dirty git state in context
+- wrap `AddGitInformation` middleware in try-catch
+
 ## 2.11.2 - 2021-07-20
 
 - fix issues introduced in 2.11.1 (#403)

config/flare.php

@@ -48,15 +48,15 @@
     */
 
     'send_logs_as_events' => true,
-    
+
     /*
     |--------------------------------------------------------------------------
     | Censor request body fields
     |--------------------------------------------------------------------------
     |
-    | These fields will be censored from your request when sent to Flare. 
+    | These fields will be censored from your request when sent to Flare.
     |
     */
-    
+
     'censor_request_body_fields' => ['password'],
 ];

resources/js/components/Shared/editorUrl.js

@@ -11,8 +11,8 @@ export default function editorUrl(config, file, lineNumber) {
         'vscode-insiders': 'vscode-insiders://file/%path:%line',
         atom: 'atom://core/open/file?filename=%path&line=%line',
         nova: 'nova://core/open/file?filename=%path&line=%line',
-        netbeans: "netbeans://open/?f=%path:%line",
-        xdebug: "xdebug://%path@%line",
+        netbeans: 'netbeans://open/?f=%path:%line',
+        xdebug: 'xdebug://%path@%line',
     };
 
     file =

resources/js/components/Tabs/ContextTab.vue

@@ -24,12 +24,6 @@
                         </a>
                     </DefinitionListRow>
                     <DefinitionListRow v-if="git.tag" label="Tag">{{ git.tag }}</DefinitionListRow>
-                    <div class="mt-4 sm:start-2" v-if="git.isDirty">
-                        <div class="inline-block alert alert-warning min-h-0">
-                            This commit is dirty. (Un)staged changes have been made since this
-                            commit.
-                        </div>
-                    </div>
                 </DefinitionList>
             </section>
 

src/Context/LaravelRequestContext.php

@@ -3,6 +3,7 @@
 namespace Facade\Ignition\Context;
 
 use Facade\FlareClient\Context\RequestContext;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Throwable;
 
@@ -70,7 +71,9 @@ public function getRequest(): array
     protected function getRouteParameters(): array
     {
         try {
-            return collect(optional($this->request->route())->parameters ?? [])->toArray();
+            return collect(optional($this->request->route())->parameters ?? [])
+                ->map(fn ($parameter) => $parameter instanceof Model ? $parameter->withoutRelations() : $parameter)
+                ->toArray();
         } catch (Throwable $e) {
             return [];
         }

src/Middleware/AddGitInformation.php

@@ -4,19 +4,22 @@
 
 use Facade\FlareClient\Report;
 use ReflectionClass;
+use Symfony\Component\Process\Exception\RuntimeException;
 use Symfony\Component\Process\Process;
 
 class AddGitInformation
 {
     public function handle(Report $report, $next)
     {
-        $report->group('git', [
-            'hash' => $this->hash(),
-            'message' => $this->message(),
-            'tag' => $this->tag(),
-            'remote' => $this->remote(),
-            'isDirty' => ! $this->isClean(),
-        ]);
+        try {
+            $report->group('git', [
+                'hash' => $this->hash(),
+                'message' => $this->message(),
+                'tag' => $this->tag(),
+                'remote' => $this->remote(),
+            ]);
+        } catch (RuntimeException $exception) {
+        }
 
         return $next($report);
     }
@@ -41,11 +44,6 @@ public function remote(): ?string
         return $this->command('git config --get remote.origin.url');
     }
 
-    public function isClean(): bool
-    {
-        return empty($this->command('git status -s'));
-    }
-
     protected function command($command)
     {
         $process = (new ReflectionClass(Process::class))->hasMethod('fromShellCommandline')