Merge branch 'main' into feature/scheduled-drafts

Author: oddvalue

.github/workflows/dependabot-auto-merge.yml

@@ -13,7 +13,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/[email protected].3
+        uses: dependabot/[email protected].6
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/phpstan.yml

@@ -20,7 +20,7 @@ jobs:
           coverage: none
 
       - name: Install composer dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
 
       - name: Run PHPStan
         run: ./vendor/bin/phpstan --error-format=github

README.md

@@ -5,8 +5,8 @@
 # A simple, drop-in drafts/revisions system for Laravel models
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/oddvalue/laravel-drafts.svg?style=flat-square)](https://packagist.org/packages/oddvalue/laravel-drafts)
-[![GitHub Tests Action Status](https://img.shields.io/github/workflow/status/oddvalue/laravel-drafts/run-tests?label=tests)](https://github.com/oddvalue/laravel-drafts/actions?query=workflow%3Arun-tests+branch%3Amain)
-[![GitHub Code Style Action Status](https://img.shields.io/github/workflow/status/oddvalue/laravel-drafts/Check%20&%20fix%20styling?label=code%20style)](https://github.com/oddvalue/laravel-drafts/actions?query=workflow%3A"Check+%26+fix+styling"+branch%3Amain)
+[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/oddvalue/laravel-drafts/run-tests.yml?label=tests&style=flat-square)](https://github.com/oddvalue/laravel-drafts/actions?query=workflow%3Arun-tests+branch%3Amain)
+[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/oddvalue/laravel-drafts/php-cs-fixer.yml?label=code%20style&style=flat-square)](https://github.com/oddvalue/laravel-drafts/actions?query=workflow%3A"Check+%26+fix+styling"+branch%3Amain)
 [![Total Downloads](https://img.shields.io/packagist/dt/oddvalue/laravel-drafts.svg?style=flat-square)](https://packagist.org/packages/oddvalue/laravel-drafts)
 
 * [Installation](#installation)
@@ -39,7 +39,7 @@ composer require oddvalue/laravel-drafts
 You can publish the config file with:
 
 ```bash
-php artisan vendor:publish --tag="laravel-drafts-config"
+php artisan vendor:publish --tag="drafts-config"
 ```
 
 This is the contents of the published config file:

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you discover any security-related issues, please email [email protected] instead of using the issue tracker.

database/migrations/create_drafts_table.php.stub

@@ -14,6 +14,11 @@
 use Illuminate\Support\Str;
 use Oddvalue\LaravelDrafts\Facades\LaravelDrafts;
 
+/**
+ * @method void Current(Builder $query)
+ * @method void WithoutCurrent(Builder $query)
+ * @method void ExcludeRevision(Builder $query, int | Model $exclude)
+ */
 trait HasDrafts
 {
     use Publishes;
@@ -87,7 +92,7 @@ protected function newRevision(): void
             return;
         }
 
-        $revision = $this->fresh()->replicate();
+        $revision = $this->fresh()?->replicate();
 
         static::saved(function () use ($revision) {
             $revision->created_at = $this->created_at;
@@ -119,7 +124,7 @@ public function generateUuid(): void
 
     public function setCurrent(): void
     {
-        $oldCurrent = $this->revisions()->withDrafts()->current()->withoutSelf()->first();
+        $oldCurrent = $this->revisions()->withDrafts()->current()->excludeRevision($this)->first();
 
         static::saved(function () use ($oldCurrent) {
             if ($oldCurrent) {
@@ -134,7 +139,7 @@ public function setCurrent(): void
 
     public function setLive(): void
     {
-        $published = $this->revisions()->withoutSelf()->published()->first();
+        $published = $this->revisions()->excludeRevision($this)->published()->first();
 
         if (! $published) {
             $this->{$this->getPublishedAtColumn()} ??= now();
@@ -296,7 +301,7 @@ public function setPublisher(): static
 
     public function pruneRevisions(): void
     {
-        $this->withoutEvents(function () {
+        self::withoutEvents(function () {
             $revisionsToKeep = $this->revisions()
                 ->orderByDesc('updated_at')
                 ->onlyDrafts()
@@ -400,7 +405,15 @@ public function scopeWithoutCurrent(Builder $query): void
         $query->where($this->getIsCurrentColumn(), false);
     }
 
-    public function scopeWithoutSelf(Builder $query)
+    public function scopeExcludeRevision(Builder $query, int | Model $exclude): void
+    {
+        $query->where($this->getKeyName(), '!=', is_int($exclude) ? $exclude : $exclude->getKey());
+    }
+
+    /**
+     * @deprecated This doesn't actually work, will be removed in next version
+     */
+    public function scopeWithoutSelf(Builder $query): void
     {
         $query->where('id', '!=', $this->id);
     }

src/Concerns/HasDrafts.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\DB;
 use Oddvalue\LaravelDrafts\Tests\Post;
 
 use function Spatie\PestPluginTestTime\testTime;
@@ -124,3 +125,13 @@
 
     expect(Post::find($originalId)->title)->toBe('Qux');
 });
+
+it('can get all revisions excluding self', function (): void {
+    $post = Post::factory()->create(['title' => 'Foo']);
+    $post->updateAsDraft(['title' => 'Bar']);
+    $post->updateAsDraft(['title' => 'Baz']);
+    $post->updateAsDraft(['title' => 'Qux']);
+
+    expect($post->revisions()->excludeRevision($post)->pluck('id'))
+        ->not()->toContain($post->id);
+});

tests/DraftsTest.php

@@ -35,11 +35,6 @@ protected function getPackageProviders($app)
     public function getEnvironmentSetUp($app)
     {
         config()->set('database.default', 'testing');
-
-        /*
-        $migration = include __DIR__.'/../database/migrations/create_laravel-drafts_table.php.stub';
-        $migration->up();
-        */
     }
 
     /**