Merge branch 'master' of github.com:facade/ignition

facade · Jan 29, 2021 · a2ad680 · a2ad680
2 parents d35c1f4 + 66b3138
commit a2ad680
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,19 @@
 
 All notable changes to `ignition` will be documented in this file
 
-## 2.5.6 - 2020-12-30
+## 2.5.9 - 2021-01-26
+
+- fix logged context not being sent to Flare
+
+## 2.5.8 - 2020-12-29
+
+- fix double `$` on PHP 8 (#338)
+
+## 2.5.7 - 2020-12-29
+
+- fix for breaking change in highlight.js (fixes 2.5.5)
+
+## 2.5.6 - 2020-12-29
 
 - revert to compiled js of 2.5.3
 

diff --git a/resources/compiled/ignition.js b/resources/compiled/ignition.js
diff --git a/resources/js/components/Shared/editorUrl.js b/resources/js/components/Shared/editorUrl.js
@@ -10,7 +10,7 @@ export default function editorUrl(config, file, lineNumber) {
         vscode: 'vscode://file/%path:%line',
         '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'
+        nova: 'nova://core/open/file?filename=%path&line=%line',
     };
 
     file =

diff --git a/resources/js/components/Stack/Snippet.vue b/resources/js/components/Stack/Snippet.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import hljs from 'highlight.js/lib/highlight';
+import hljs from 'highlight.js/lib/core';
 hljs.registerLanguage('php', require('highlight.js/lib/languages/php'));
 
 import ExceptionClass from '../Shared/ExceptionClass.vue';

diff --git a/src/Logger/FlareHandler.php b/src/Logger/FlareHandler.php
@@ -3,6 +3,7 @@
 namespace Facade\Ignition\Logger;
 
 use Facade\FlareClient\Flare;
+use Facade\FlareClient\Report;
 use Facade\Ignition\Ignition;
 use Facade\Ignition\Tabs\Tab;
 use Monolog\Handler\AbstractProcessingHandler;
@@ -54,7 +55,15 @@ protected function write(array $report): void
 
         if (config('flare.send_logs_as_events')) {
             if ($this->hasValidLogLevel($report)) {
-                $this->flare->reportMessage($report['message'], 'Log '.Logger::getLevelName($report['level']));
+                $this->flare->reportMessage(
+                    $report['message'],
+                    'Log ' . Logger::getLevelName($report['level']),
+                    function (Report $flareReport) use ($report) {
+                        foreach ($report['context'] as $key => $value) {
+                            $flareReport->context($key, $value);
+                        }
+                    }
+                );
             }
         }
     }

diff --git a/src/SolutionProviders/UndefinedVariableSolutionProvider.php b/src/SolutionProviders/UndefinedVariableSolutionProvider.php
@@ -79,6 +79,7 @@ protected function getNameAndView(Throwable $throwable): ?array
 
         if (count($matches) === 3) {
             [, $variableName, $viewFile] = $matches;
+            $variableName = ltrim($variableName, '$');
 
             return compact('variableName', 'viewFile');
         }

diff --git a/yarn.lock b/yarn.lock
@@ -3144,9 +3144,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
+  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
 
 interpret@1.2.0:
   version "1.2.0"