Merge branch '4.x'

Author: nunomaduro

.github/ISSUE_TEMPLATE/1_Bug_report.yml

@@ -1,9 +1,9 @@
 name: Bug Report
-description: "Report a general library issue."
+description: "Report something that's broken."
 body:
   - type: markdown
     attributes:
-      value: "Before submitting your report, [please ensure your Laravel version is still supported](https://laravel.com/docs/releases#support-policy)."
+      value: "Please read [our full contribution guide](https://laravel.com/docs/contributions#bug-reports) before submitting bug reports. If you notice improper DocBlock, PHPStan, or IDE warnings while using Laravel, do not create a GitHub issue. Instead, please submit a pull request to fix the problem."
   - type: input
     attributes:
       label: Telescope Version
@@ -14,7 +14,7 @@ body:
   - type: input
     attributes:
       label: Laravel Version
-      description: Provide the Laravel version that you are using.
+      description: Provide the Laravel version that you are using. [Please ensure it is still supported.](https://laravel.com/docs/releases#support-policy)
       placeholder: 10.4.1
     validations:
       required: true

.github/workflows/static-analysis.yml

@@ -12,30 +12,4 @@ permissions:
 
 jobs:
   tests:
-    runs-on: ubuntu-22.04
-
-    strategy:
-      fail-fast: true
-
-    name: Static Analysis
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.2
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
-
-      - name: Execute type checking
-        run: vendor/bin/phpstan
+    uses: laravel/.github/.github/workflows/static-analysis.yml@main

CHANGELOG.md

@@ -1,6 +1,23 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/telescope/compare/v4.17.2...master)
+## [Unreleased](https://github.com/laravel/telescope/compare/v4.17.6...master)
+
+## [v4.17.6](https://github.com/laravel/telescope/compare/v4.17.5...v4.17.6) - 2024-02-08
+
+* [4.x] Add `use` to closure to pass in environment condition by [@LaurenceRawlings](https://github.com/LaurenceRawlings) in https://github.com/laravel/telescope/pull/1434
+
+## [v4.17.5](https://github.com/laravel/telescope/compare/v4.17.4...v4.17.5) - 2024-01-30
+
+* [4.x] Ignore duplicate tags by [@driesvints](https://github.com/driesvints) in https://github.com/laravel/telescope/pull/1431
+
+## [v4.17.4](https://github.com/laravel/telescope/compare/v4.17.3...v4.17.4) - 2024-01-22
+
+* [4.x] Add primary keys to database tables by [@driesvints](https://github.com/driesvints) in https://github.com/laravel/telescope/pull/1425
+
+## [v4.17.3](https://github.com/laravel/telescope/compare/v4.17.2...v4.17.3) - 2023-12-11
+
+* fix: clear all entries using chunks by [@skrskr](https://github.com/skrskr) in https://github.com/laravel/telescope/pull/1415
+* Ignore pulse and livewire by [@tomswinkels](https://github.com/tomswinkels) in https://github.com/laravel/telescope/pull/1418
 
 ## [v4.17.2](https://github.com/laravel/telescope/compare/v4.17.1...v4.17.2) - 2023-11-01
 

database/migrations/2018_08_08_100000_create_telescope_entries_table.php

@@ -42,7 +42,7 @@ public function up(): void
             $table->uuid('entry_uuid');
             $table->string('tag');
 
-            $table->index(['entry_uuid', 'tag']);
+            $table->primary(['entry_uuid', 'tag']);
             $table->index('tag');
 
             $table->foreign('entry_uuid')
@@ -52,7 +52,7 @@ public function up(): void
         });
 
         $schema->create('telescope_monitoring', function (Blueprint $table) {
-            $table->string('tag');
+            $table->string('tag')->primary();
         });
     }
 

package-lock.json

@@ -19,7 +19,7 @@ class ClearCommand extends Command
      *
      * @var string
      */
-    protected $description = 'Clear all entries from Telescope';
+    protected $description = 'Delete all Telescope data from storage';
 
     /**
      * Execute the console command.

src/Console/ClearCommand.php

@@ -3,6 +3,7 @@
 namespace Laravel\Telescope\Storage;
 
 use DateTimeInterface;
+use Illuminate\Database\UniqueConstraintViolationException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Laravel\Telescope\Contracts\ClearableRepository;
@@ -189,14 +190,18 @@ protected function storeExceptions(Collection $exceptions)
     protected function storeTags(Collection $results)
     {
         $results->chunk($this->chunkSize)->each(function ($chunked) {
-            $this->table('telescope_entries_tags')->insert($chunked->flatMap(function ($tags, $uuid) {
-                return collect($tags)->map(function ($tag) use ($uuid) {
-                    return [
-                        'entry_uuid' => $uuid,
-                        'tag' => $tag,
-                    ];
-                });
-            })->all());
+            try {
+                $this->table('telescope_entries_tags')->insert($chunked->flatMap(function ($tags, $uuid) {
+                    return collect($tags)->map(function ($tag) use ($uuid) {
+                        return [
+                            'entry_uuid' => $uuid,
+                            'tag' => $tag,
+                        ];
+                    });
+                })->all());
+            } catch (UniqueConstraintViolationException $e) {
+                // Ignore tags that already exist...
+            }
         });
     }
 
@@ -246,14 +251,18 @@ public function update(Collection $updates)
     protected function updateTags($entry)
     {
         if (! empty($entry->tagsChanges['added'])) {
-            $this->table('telescope_entries_tags')->insert(
-                collect($entry->tagsChanges['added'])->map(function ($tag) use ($entry) {
-                    return [
-                        'entry_uuid' => $entry->uuid,
-                        'tag' => $tag,
-                    ];
-                })->toArray()
-            );
+            try {
+                $this->table('telescope_entries_tags')->insert(
+                    collect($entry->tagsChanges['added'])->map(function ($tag) use ($entry) {
+                        return [
+                            'entry_uuid' => $entry->uuid,
+                            'tag' => $tag,
+                        ];
+                    })->toArray()
+                );
+            } catch (UniqueConstraintViolationException $e) {
+                // Ignore tags that already exist...
+            }
         }
 
         collect($entry->tagsChanges['removed'])->each(function ($tag) use ($entry) {

src/Storage/DatabaseEntriesRepository.php

@@ -18,12 +18,11 @@ class TelescopeServiceProvider extends TelescopeApplicationServiceProvider
 
         $this->hideSensitiveRequestDetails();
 
-        Telescope::filter(function (IncomingEntry $entry) {
-            if ($this->app->environment('local')) {
-                return true;
-            }
+        $isLocal = $this->app->environment('local');
 
-            return $entry->isReportableException() ||
+        Telescope::filter(function (IncomingEntry $entry) use ($isLocal) {
+            return $isLocal ||
+                   $entry->isReportableException() ||
                    $entry->isFailedRequest() ||
                    $entry->isFailedJob() ||
                    $entry->isScheduledTask() ||