laravel 10

recca0120 · Feb 15, 2023 · cfe8079 · cfe8079
1 parent 63d562b
commit cfe8079
Show file tree

Hide file tree

Showing 33 changed files with 904 additions and 161 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
         stability: [ prefer-stable ]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}

diff --git a/composer.json b/composer.json
@@ -21,19 +21,19 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "illuminate/contracts": "^5.1|^6.0|^7.0|^8.0|^9.0",
-        "illuminate/database": "^5.1|^6.0|^7.0|^8.0|^9.0",
-        "illuminate/routing": "^5.1|^6.0|^7.0|^8.0|^9.0",
-        "illuminate/session": "^5.1|^6.0|^7.0|^8.0|^9.0",
-        "illuminate/support": "^5.1|^6.0|^7.0|^8.0|^9.0",
-        "illuminate/view": "^5.1|^6.0|^7.0|^8.0|^9.0",
+        "illuminate/contracts": "^5.1|^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/database": "^5.1|^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/routing": "^5.1|^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/session": "^5.1|^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/support": "^5.1|^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/view": "^5.1|^6.0|^7.0|^8.0|^9.0|^10.0",
         "recca0120/terminal": "^1.8",
         "tracy/tracy": ">=2.4,<2.9"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
         "nesbot/carbon": "^1.20|^2.0",
-        "orchestra/testbench": "^2.0|^3.0|^4.18|^5.20|^6.23|^7.0",
+        "orchestra/testbench": "^2.0|^3.0|^4.18|^5.20|^6.23|^7.0|^8.0",
         "phpunit/phpunit": "^4.8|^5.4|^6.1|^7.0|^8.0|^9.0"
     },
     "autoload": {

diff --git a/resources/views/AuthPanel/panel.php b/resources/views/AuthPanel/panel.php
@@ -2,21 +2,21 @@
 
 <div class="tracy-inner Laravel-AuthPanel">
     <div class="tracy-inner-container">
-        <?php if (empty($rows) === true): ?>
+        <?php if (empty($rows) === true) { ?>
             <p>No identity</p>
-        <?php else: ?>
+        <?php } else { ?>
             <table>
                 <tbody>
-                    <?php foreach ($rows as $key => $value): ?>
+                    <?php foreach ($rows as $key => $value) { ?>
                         <tr>
                             <th><?php echo $key  ?></th>
                             <td>
                                 <?php echo Tracy\Dumper::toHtml($value, [Tracy\Dumper::LIVE => true]) ?>
                             </td>
                         </tr>
-                    <?php endforeach ?>
+                    <?php } ?>
                 </tbody>
             </table>
-        <?php endif ?>
+        <?php } ?>
     </div>
 </div>
diff --git a/resources/views/DatabasePanel/panel.php b/resources/views/DatabasePanel/panel.php
@@ -15,20 +15,20 @@
                 <th>Time&nbsp;ms / Name</th>
                 <th>SQL Query</th>
             </tr>
-            <?php foreach ($queries as $query): ?>
+            <?php foreach ($queries as $query) { ?>
                 <tr>
                     <td>
                         <?php echo sprintf('%0.3f', $query['time']) ?> / <?php echo $query['name'] ?>
-                        <?php if (count($query['hints']) > 0): ?>
+                        <?php if (count($query['hints']) > 0) { ?>
                             <br /><a class="tracy-toggle tracy-collapsed" data-tracy-ref="^tr .Laravel-DatabasePanel-hint">hint</a>
-                        <?php endif; ?>
-                        <?php if (count($query['explains']) > 0): ?>
+                        <?php } ?>
+                        <?php if (count($query['explains']) > 0) { ?>
                             <br /><a class="tracy-toggle tracy-collapsed" data-tracy-ref="^tr .Laravel-DatabasePanel-explain">explain</a>
-                        <?php endif; ?>
+                        <?php } ?>
                     </td>
                     <td class="Laravel-DatabasePanel-sql">
                         <?php echo $query['highlight'] ?>
-                        <?php if (count($query['hints']) > 0): ?>
+                        <?php if (count($query['hints']) > 0) { ?>
                             <?php $i = 0 ?>
                             <table class="tracy-collapsed Laravel-DatabasePanel-hint" id="">
                                 <thead>
@@ -37,37 +37,37 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                <?php foreach ($query['hints'] as $hint): ?>
+                                <?php foreach ($query['hints'] as $hint) { ?>
                                     <tr>
                                         <td><?php echo ++$i; ?></td><td><?php echo $hint ?></td>
                                     </tr>
-                                <?php endforeach; ?>
+                                <?php } ?>
                                 </tbody>
                             </table>
-                        <?php endif ?>
+                        <?php } ?>
 
-                        <?php if ($query['explains']): ?>
+                        <?php if ($query['explains']) { ?>
                             <table class="tracy-collapsed Laravel-DatabasePanel-explain">
                                 <tr>
-                                    <?php foreach ($query['explains'][0] as $col => $value): ?>
+                                    <?php foreach ($query['explains'][0] as $col => $value) { ?>
                                         <th><?php echo htmlspecialchars((string) $col, ENT_NOQUOTES, 'UTF-8') ?></th>
-                                    <?php endforeach ?>
+                                    <?php } ?>
                                 </tr>
-                                <?php foreach ($query['explains'] as $row): ?>
+                                <?php foreach ($query['explains'] as $row) { ?>
                                     <tr>
-                                        <?php foreach ($row as $value): ?>
+                                        <?php foreach ($row as $value) { ?>
                                             <td><?php echo htmlspecialchars((string) $value, ENT_NOQUOTES, 'UTF-8') ?></td>
-                                        <?php endforeach ?>
+                                        <?php } ?>
                                     </tr>
-                                <?php endforeach ?>
+                                <?php } ?>
                             </table>
-                        <?php endif ?>
-                        <?php if ($query['editorLink']): ?>
+                        <?php } ?>
+                        <?php if ($query['editorLink']) { ?>
                             <?php echo substr_replace($query['editorLink'], ' class="Laravel-DatabasePanel-source"', 2, 0) ?>
-                        <?php endif ?>
+                        <?php } ?>
                     </td>
                 </tr>
-            <?php endforeach ?>
+            <?php } ?>
         </table>
     </div>
 </div>
diff --git a/resources/views/EventPanel/panel.php b/resources/views/EventPanel/panel.php
@@ -21,7 +21,7 @@
                                 Tracy\Dumper::TRUNCATE => 50,
                                 Tracy\Dumper::COLLAPSE => true,
                             ]);
-                        ?>
+                ?>
                     </td>
                 </tr>
             <?php } ?>

diff --git a/resources/views/HtmlValidatorPanel/panel.php b/resources/views/HtmlValidatorPanel/panel.php
@@ -13,14 +13,14 @@
 <div class="tracy-inner Laravel-HtmlValidatorPanel">
     <div class="tracy-inner-container">
         <table>
-            <?php foreach ($errors as $error): ?>
+            <?php foreach ($errors as $error) { ?>
             <tr><td><span class="severenity-<?php echo (int) $error->level; ?>">
                 <?php echo htmlspecialchars($severenity[$error->level].' on column '.$error->column.': '.$error->message); ?>
             </span></td></tr>
             <tr><td>
                 <?php echo \Tracy\BlueScreen::highlightPhp($html, $error->line, 10); ?>
             </td></tr>
-            <?php endforeach ?>
+            <?php } ?>
         </table>
     </div>
 </div>
diff --git a/resources/views/RequestPanel/panel.php b/resources/views/RequestPanel/panel.php
@@ -3,7 +3,7 @@
 <div class="tracy-inner Laravel-RequestPanel">
     <div class="tracy-inner-container">
         <table>
-            <?php foreach ($rows as $key => $value): ?>
+            <?php foreach ($rows as $key => $value) { ?>
                 <tr>
                     <th>
                         <?php echo ucfirst($key) ?>
@@ -12,7 +12,7 @@
                         <?php echo Tracy\Dumper::toHtml($value, [Tracy\Dumper::LIVE => true]) ?>
                     </td>
                 </tr>
-            <?php endforeach ?>
+            <?php } ?>
         </table>
     </div>
 </div>
diff --git a/resources/views/RoutingPanel/panel.php b/resources/views/RoutingPanel/panel.php
@@ -4,14 +4,14 @@
     <div class="tracy-inner-container">
         <table>
             <tbody>
-                <?php foreach ($rows as $key => $value): ?>
+                <?php foreach ($rows as $key => $value) { ?>
                     <tr>
                         <th><?php echo $key ?></th>
                         <td>
                             <?php echo Tracy\Dumper::toHtml($value, [Tracy\Dumper::LIVE => true]) ?>
                         </td>
                     </tr>
-                <?php endforeach ?>
+                <?php } ?>
             </tbody>
         </table>
     </div>

diff --git a/resources/views/SessionPanel/panel.php b/resources/views/SessionPanel/panel.php
@@ -2,21 +2,21 @@
 
 <div class="tracy-inner Laravel-SessionPanel">
     <div class="tracy-inner-container">
-        <?php if (empty($rows) === true): ?>
+        <?php if (empty($rows) === true) { ?>
             <p><i>empty</i></p>
-        <?php else: ?>
+        <?php } else { ?>
             <table>
                 <tbody>
-                    <?php foreach ($rows as $key => $value): ?>
+                    <?php foreach ($rows as $key => $value) { ?>
                         <tr>
                             <th><?php echo $key  ?></th>
                             <td>
                                 <?php echo Tracy\Dumper::toHtml($value, [Tracy\Dumper::LIVE => true]) ?>
                             </td>
                         </tr>
-                    <?php endforeach ?>
+                    <?php } ?>
                 </tbody>
             </table>
-        <?php endif ?>
+        <?php } ?>
     </div>
 </div>
diff --git a/resources/views/TerminalPanel/panel.php b/resources/views/TerminalPanel/panel.php
@@ -7,10 +7,10 @@
 
 <div class="tracy-inner Laravel-TerminalPanel">
     <div class="tracy-inner-container">
-        <?php if (empty($terminal) === false): ?>
+        <?php if (empty($terminal) === false) { ?>
             <?php echo $terminal; ?>
-        <?php else: ?>
+        <?php } else { ?>
             <span style="color: #fff;">Terminal is Disabled</span>
-        <?php endif ?>
+        <?php } ?>
     </div>
 </div>
diff --git a/resources/views/ViewPanel/panel.php b/resources/views/ViewPanel/panel.php
@@ -11,7 +11,7 @@
                     data
                 </th>
             </tr>
-            <?php foreach ($rows as $row): ?>
+            <?php foreach ($rows as $row) { ?>
                 <tr>
                     <td>
                         <?php echo $row['name'] ?>
@@ -21,7 +21,7 @@
                         <?php echo Tracy\Dumper::toHtml($row['data'], [Tracy\Dumper::LIVE => true]) ?>
                     </td>
                 </tr>
-            <?php endforeach ?>
+            <?php } ?>
         </table>
     </div>
 </div>
diff --git a/src/BarManager.php b/src/BarManager.php
@@ -42,9 +42,9 @@ class BarManager
     /**
      * __construct.
      *
-     * @param Bar $bar
-     * @param Request $request
-     * @param Application $app
+     * @param  Bar  $bar
+     * @param  Request  $request
+     * @param  Application  $app
      */
     public function __construct(Bar $bar = null, Request $request = null, Application $app = null)
     {
@@ -66,7 +66,7 @@ public function getBar()
     /**
      * loadPanels.
      *
-     * @param array $panels
+     * @param  array  $panels
      * @return $this
      */
     public function loadPanels($panels = [])
@@ -96,7 +96,7 @@ public function loadPanels($panels = [])
     /**
      * make.
      *
-     * @param string $id
+     * @param  string  $id
      * @return IBarPanel
      */
     private static function make($id)
@@ -109,8 +109,8 @@ private static function make($id)
     /**
      * set.
      *
-     * @param IBarPanel $panel
-     * @param string $id
+     * @param  IBarPanel  $panel
+     * @param  string  $id
      * @return $this
      */
     public function set(IBarPanel $panel, $id)
@@ -125,7 +125,7 @@ public function set(IBarPanel $panel, $id)
     /**
      * get.
      *
-     * @param string $id
+     * @param  string  $id
      * @return IBarPanel
      */
     public function get($id)
@@ -136,7 +136,7 @@ public function get($id)
     /**
      * isAjaxPanel.
      *
-     * @param string $id
+     * @param  string  $id
      * @return bool
      */
     private function isAjaxPanel($id)
@@ -147,7 +147,7 @@ private function isAjaxPanel($id)
     /**
      * name.
      *
-     * @param string $id
+     * @param  string  $id
      * @return string
      */
     private static function name($id)

diff --git a/src/Contracts/ILaravelPanel.php b/src/Contracts/ILaravelPanel.php
@@ -9,7 +9,7 @@ interface ILaravelPanel
     /**
      * setLaravel.
      *
-     * @param \Illuminate\Contracts\Foundation\Application $laravel
+     * @param  \Illuminate\Contracts\Foundation\Application  $laravel
      * @return static
      */
     public function setLaravel(Application $laravel = null);
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
                                     Tracy\Dumper::TRUNCATE => 50,
                                     Tracy\Dumper::COLLAPSE => true,
                                 ]);
-                            ?>
+                    ?>
                         </td>
                     </tr>
                 <?php } ?>
@@ Expand Down @@