spatie
diff --git a/‎.github/workflows/composer-normalize.yml‎
Lines changed: 0 additions & 23 deletions b/‎.github/workflows/composer-normalize.yml‎
Lines changed: 0 additions & 23 deletions
diff --git a/‎.github/workflows/phpstan.yml‎
Lines changed: 22 additions & 0 deletions b/‎.github/workflows/phpstan.yml‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎.github/workflows/php-cs-fixer.yml‎ ‎.github/workflows/pint.yml‎.github/workflows/php-cs-fixer.yml renamed to .github/workflows/pint.yml
Lines changed: 11 additions & 5 deletions b/‎.github/workflows/php-cs-fixer.yml‎ ‎.github/workflows/pint.yml‎.github/workflows/php-cs-fixer.yml renamed to .github/workflows/pint.yml
Lines changed: 11 additions & 5 deletions
diff --git a/‎.github/workflows/run-tests.yml‎
Lines changed: 3 additions & 22 deletions b/‎.github/workflows/run-tests.yml‎
Lines changed: 3 additions & 22 deletions
diff --git a/‎.github/workflows/stale-issues.yml‎
Lines changed: 0 additions & 17 deletions b/‎.github/workflows/stale-issues.yml‎
Lines changed: 0 additions & 17 deletions
diff --git a/‎README.md‎
Lines changed: 5 additions & 5 deletions b/‎README.md‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎UPGRADING.md‎
Lines changed: 158 additions & 1 deletion b/‎UPGRADING.md‎
Lines changed: 158 additions & 1 deletion
diff --git a/‎composer.json‎
Lines changed: 8 additions & 6 deletions b/‎composer.json‎
Lines changed: 8 additions & 6 deletions
@@ -0,0 +1,22 @@
+name: PHPStan
+
+on: [push]
+
+jobs:
+    phpstan:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.4
+
+            - name: Install dependencies
+              run: composer install --no-interaction --no-progress
+
+            - name: Run PHPStan
+              run: vendor/bin/phpstan analyse
@@ -3,19 +3,25 @@ name: Check & fix styling
 on: [push]
 
 jobs:
-    php-cs-fixer:
+    pint:
         runs-on: ubuntu-latest
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   ref: ${{ github.head_ref }}
 
-            - name: Run PHP CS Fixer
-              uses: docker://oskarstark/php-cs-fixer-ga:2.19.0
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
               with:
-                  args: --config=.php_cs.dist --allow-risky=yes
+                  php-version: 8.4
+
+            - name: Install dependencies
+              run: composer install --no-interaction --no-progress
+
+            - name: Run Pint
+              run: vendor/bin/pint
 
             - name: Commit changes
               uses: stefanzweifel/git-auto-commit-action@v5.2.0
 
@@ -3,8 +3,6 @@ name: run-tests
 on:
   push:
   pull_request:
-  schedule:
-    - cron: '0 0 * * *'
 
 jobs:
   test:
@@ -15,26 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.5, 8.4, 8.3, 8.2, 8.1]
-        laravel: [^9.0, ^10.0, ^11.0, ^12.0, ^13.0]
+        php: [8.5, 8.4]
+        laravel: [^12.0, ^13.0]
         dependency-version: [prefer-lowest, prefer-stable]
-        exclude:
-          - laravel: ^12.0
-            php: 8.1
-          - laravel: ^11.0
-            php: 8.1
-          - laravel: ^10.0
-            php: 8.4
-          - laravel: ^10.0
-            php: 8.5
-          - laravel: ^9.0
-            php: 8.4
-          - laravel: ^9.0
-            php: 8.5
-          - laravel: ^13.0
-            php: 8.2
-          - laravel: ^13.0
-            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
@@ -51,7 +32,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:>=2.72" --dev --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" --dev --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
 
@@ -16,7 +16,7 @@
 </div>
 
 The `spatie/laravel-activitylog` package provides easy to use functions to log the activities of the users of your app. It can also automatically log model events.
-The Package stores all activity in the `activity_log` table.
+The package stores all activity in the `activity_log` table.
 
 Here's a demo of how you can use it:
 
@@ -43,7 +43,7 @@ $lastLoggedActivity = Activity::all()->last();
 
 $lastLoggedActivity->subject; //returns an instance of an eloquent model
 $lastLoggedActivity->causer; //returns an instance of your user model
-$lastLoggedActivity->getExtraProperty('customProperty'); //returns 'customValue'
+$lastLoggedActivity->getProperty('customProperty'); //returns 'customValue'
 $lastLoggedActivity->description; //returns 'Look, I logged something'
 ```
 
@@ -60,17 +60,17 @@ $activity->description; //returns 'updated'
 $activity->subject; //returns the instance of NewsItem that was saved
 ```
 
-Calling `$activity->changes()` will return this array:
+Calling `$activity->attribute_changes` will return this collection:
 
 ```php
 [
    'attributes' => [
         'name' => 'updated name',
-        'text' => 'Lorum',
+        'text' => 'Lorem',
     ],
     'old' => [
         'name' => 'original name',
-        'text' => 'Lorum',
+        'text' => 'Lorem',
     ],
 ];
 ```
 
@@ -1,3 +1,160 @@
+## From v4 to v5
+
+```bash
+composer require spatie/laravel-activitylog "^5.0.0"
+```
+
+### Requirements
+
+v5 requires **PHP 8.4+** and **Laravel 12+**. If you're on older versions, stay on v4.
+
+### Migration
+
+v5 ships a single consolidated migration with a new schema. If you're upgrading from v4, you need to create a migration to:
+
+1. Add the `attribute_changes` column (new, stores tracked model changes)
+2. Drop the `batch_uuid` column (batch system removed)
+3. Migrate existing change data from `properties` to `attribute_changes`
+
+```php
+// Example upgrade migration
+Schema::table('activity_log', function (Blueprint $table) {
+    $table->json('attribute_changes')->nullable()->after('causer_id');
+    $table->dropColumn('batch_uuid');
+});
+
+// Then migrate existing data: move 'attributes' and 'old' from properties to attribute_changes
+DB::table('activity_log')->whereNotNull('properties')->eachById(function ($row) {
+    $properties = json_decode($row->properties, true);
+    $changes = array_intersect_key($properties, array_flip(['attributes', 'old']));
+    $remaining = array_diff_key($properties, array_flip(['attributes', 'old']));
+
+    DB::table('activity_log')->where('id', $row->id)->update([
+        'attribute_changes' => empty($changes) ? null : json_encode($changes),
+        'properties' => empty($remaining) ? null : json_encode($remaining),
+    ]);
+});
+```
+
+### Schema changes
+
+- **`properties`** column now stores only custom user data (set via `withProperties()`)
+- **`attribute_changes`** column (new) stores tracked model changes (`attributes`, `old`)
+- **`batch_uuid`** column removed (batch system dropped)
+- `getExtraProperty()` renamed to `getProperty()`
+- `$activity->changes` / `$activity->changes()` replaced by `$activity->attribute_changes`
+
+### Batch system removed
+
+The `LogBatch` class, `LogBatch` facade, and `Activity::batch()` have been removed. If you need to group activities, use a custom property:
+
+```php
+$groupId = Str::uuid();
+activity()->withProperty('group', $groupId)->log('first');
+Activity::where('properties->group', $groupId)->get();
+```
+
+### Renamed methods
+
+| v4 | v5 |
+|---|---|
+| `$model->activities` (LogsActivity) | `$model->activitiesAsSubject` |
+| `$model->actions` (CausesActivity) | `$model->activitiesAsCauser` |
+| `$activity->changes()` | `$activity->attribute_changes` |
+| `getExtraProperty()` | `getProperty()` |
+| `dontSubmitEmptyLogs()` | `dontLogEmptyChanges()` |
+| `submitEmptyLogs()` | `logEmptyChanges()` |
+| `withoutLogs()` | `withoutLogging()` |
+| `CauserResolver::setCauser($model)` | `Activity::defaultCauser($model)` |
+| `CauserResolver::withCauser($model, fn)` | `Activity::defaultCauser($model, fn)` |
+| `tapActivity($activity, $event)` on models | `beforeActivityLogged($activity, $event)` |
+
+### Namespace changes
+
+Several classes moved to sub-namespaces:
+
+| v4 | v5 |
+|---|---|
+| `Spatie\Activitylog\LogOptions` | `Spatie\Activitylog\Support\LogOptions` |
+| `Spatie\Activitylog\CauserResolver` | `Spatie\Activitylog\Support\CauserResolver` |
+| `Spatie\Activitylog\ActivityLogStatus` | `Spatie\Activitylog\Support\ActivityLogStatus` |
+| `Spatie\Activitylog\ActivityLogger` | `Spatie\Activitylog\Support\ActivityLogger` |
+| `Spatie\Activitylog\PendingActivityLog` | `Spatie\Activitylog\Support\PendingActivityLog` |
+| `Spatie\Activitylog\ActivityEvent` | `Spatie\Activitylog\Enums\ActivityEvent` |
+| `Spatie\Activitylog\CleanActivitylogCommand` | `Spatie\Activitylog\Commands\CleanActivitylogCommand` |
+| `Spatie\Activitylog\Traits\LogsActivity` | `Spatie\Activitylog\Models\Concerns\LogsActivity` |
+| `Spatie\Activitylog\Traits\CausesActivity` | `Spatie\Activitylog\Models\Concerns\CausesActivity` |
+| `Spatie\Activitylog\Traits\HasActivity` | `Spatie\Activitylog\Models\Concerns\HasActivity` |
+
+### HasActivity trait
+
+v5 reintroduces the `HasActivity` trait. It combines `LogsActivity` and `CausesActivity` and provides an `activities()` convenience method. Use it on models (like User) that both cause and log activities.
+
+### getActivitylogOptions() is now optional
+
+You no longer need to implement `getActivitylogOptions()` on every model. The default logs events (created, updated, deleted) without tracking attribute changes. Override the method only when you need to customize attribute logging.
+
+### CauserResolver facade removed
+
+The `CauserResolver` facade has been removed. Use `Activity::defaultCauser()` instead:
+
+```php
+// v4
+CauserResolver::setCauser($admin);
+CauserResolver::withCauser($admin, fn() => ...);
+
+// v5
+Activity::defaultCauser($admin);
+Activity::defaultCauser($admin, fn() => ...);
+```
+
+The `CauserResolver` class still exists and can be resolved from the container for advanced use cases (custom resolution callbacks).
+
+### ActivityEvent enum
+
+v5 introduces an `ActivityEvent` enum. All methods that accept event names also accept the enum:
+
+```php
+use Spatie\Activitylog\Enums\ActivityEvent;
+
+Activity::forEvent(ActivityEvent::Created)->get();
+activity()->event(ActivityEvent::Updated)->log('...');
+```
+
+Plain strings still work for custom event names.
+
+### Config changes
+
+The config file has been simplified. Republish it or update manually.
+
+**Renamed keys:**
+
+| v4 | v5 |
+|---|---|
+| `enabled` (env: `ACTIVITY_LOGGER_ENABLED`) | `enabled` (env: `ACTIVITYLOG_ENABLED`) |
+| `delete_records_older_than_days` | `clean_after_days` |
+| `subject_returns_soft_deleted_models` | `include_soft_deleted_subjects` |
+
+**Removed keys:**
+- `table_name` and `database_connection` have been removed. If you need a custom table name or connection, create a custom Activity model and set `$table` / `$connection` on it. Then point `activity_model` to your custom model.
+
+**New keys:**
+- `actions.log_activity`: action class for logging (default: `LogActivityAction::class`)
+- `actions.clean_log`: action class for cleaning (default: `CleanActivityLogAction::class`)
+
+### Pipe system removed
+
+The `addLogChange()` method, `LoggablePipe` interface, and `EventLogBag` class have been removed. To manipulate the changes array before saving, override `transformChanges()` on a custom `LogActivityAction` instead. See the [customizing actions](/docs/laravel-activitylog/v5/advanced-usage/customizing-actions) documentation.
+
+### Customizable actions
+
+Core operations are now handled by action classes that can be extended and swapped via config. This lets you customize how activities are saved (e.g., queue them) or how old records are cleaned without overriding the entire logger or command.
+
+**New keys:**
+- `default_except_attributes`: globally exclude attributes from logging for all models
+
+---
+
 ## From v3 to v4
 
 ``` bash
@@ -17,7 +174,7 @@ php artisan migrate
 - To control what attributes are logged, instead of defining a `$logAttributes` property this is defined in the `getActivitylogOptions()` method using the `logOnly()` method of `LogOptions`.
 - The `getDescriptionForEvent()` method is no longer used to customize the description. Instead, use the `setDescriptionForEvent()` method for `LogOptions` class.
 - When customizing the log's name instead of defining a `$logName` property, call the `useLogName()` method when configuring the `LogOptions`.
-- Instead of the `$ignoreChangedAttributes` property the ` dontLogIfAttributesChangedOnly()` method should be used.
+- Instead of the `$ignoreChangedAttributes` property the `dontLogIfAttributesChangedOnly()` method should be used.
 - If you only need to log the dirty attributes use `logOnlyDirty()` since the `$logOnlyDirty` property is no longer used.
 - For instances where you do not want to store empty log events use `dontSubmitEmptyLogs()` instead of setting `$submitEmptyLogs` to `false`.
 - When you use a `*` (wildcard) and want to ignore specific elements use the `dontLogIfAttributesChangedOnly()` method instead of the `$logAttributesToIgnore` property.
 
@@ -31,16 +31,18 @@
     ],
     "homepage": "https://github.com/spatie/activitylog",
     "require": {
-        "php": "^8.1",
-        "illuminate/config": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0 || ^13.0",
-        "illuminate/database": "^8.69 || ^9.27 || ^10.0 || ^11.0 || ^12.0 || ^13.0",
-        "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0 || ^13.0",
+        "php": "^8.4",
+        "illuminate/config": "^12.0 || ^13.0",
+        "illuminate/database": "^12.0 || ^13.0",
+        "illuminate/support": "^12.0 || ^13.0",
         "spatie/laravel-package-tools": "^1.6.3"
     },
     "require-dev": {
         "ext-json": "*",
-        "orchestra/testbench": "^6.23 || ^7.0 || ^8.0 || ^9.6 || ^10.0 || ^11.0",
-        "pestphp/pest": "^1.20 || ^2.0 || ^3.0 || ^4.0"
+        "larastan/larastan": "^3.0",
+        "laravel/pint": "^1.29",
+        "orchestra/testbench": "^10.0 || ^11.0",
+        "pestphp/pest": "^4.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,