[5.x] Use constructor property promotion in events (#11380)

statamic · Jan 23, 2025 · 10ae91c · 10ae91c
1 parent 7a144d5
commit 10ae91c
Show file tree

Hide file tree

Showing 124 changed files with 121 additions and 510 deletions.
diff --git a/src/Events/AssetContainerBlueprintFound.php b/src/Events/AssetContainerBlueprintFound.php
@@ -4,14 +4,7 @@
 
 class AssetContainerBlueprintFound extends Event
 {
-    public $blueprint;
-    public $container;
-    public $asset;
-
-    public function __construct($blueprint, $container = null, $asset = null)
+    public function __construct(public $blueprint, public $container = null, public $asset = null)
     {
-        $this->blueprint = $blueprint;
-        $this->container = $container;
-        $this->asset = $asset;
     }
 }
diff --git a/src/Events/AssetContainerCreated.php b/src/Events/AssetContainerCreated.php
@@ -4,10 +4,7 @@
 
 class AssetContainerCreated extends Event
 {
-    public $container;
-
-    public function __construct($container)
+    public function __construct(public $container)
     {
-        $this->container = $container;
     }
 }
diff --git a/src/Events/AssetContainerCreating.php b/src/Events/AssetContainerCreating.php
@@ -4,11 +4,8 @@
 
 class AssetContainerCreating extends Event
 {
-    public $container;
-
-    public function __construct($container)
+    public function __construct(public $container)
     {
-        $this->container = $container;
     }
 
     /**

diff --git a/src/Events/AssetContainerDeleted.php b/src/Events/AssetContainerDeleted.php
@@ -6,11 +6,8 @@
 
 class AssetContainerDeleted extends Event implements ProvidesCommitMessage
 {
-    public $container;
-
-    public function __construct($container)
+    public function __construct(public $container)
     {
-        $this->container = $container;
     }
 
     public function commitMessage()

diff --git a/src/Events/AssetContainerDeleting.php b/src/Events/AssetContainerDeleting.php
@@ -4,11 +4,8 @@
 
 class AssetContainerDeleting extends Event
 {
-    public $container;
-
-    public function __construct($container)
+    public function __construct(public $container)
     {
-        $this->container = $container;
     }
 
     /**

diff --git a/src/Events/AssetContainerSaved.php b/src/Events/AssetContainerSaved.php
@@ -6,11 +6,8 @@
 
 class AssetContainerSaved extends Event implements ProvidesCommitMessage
 {
-    public $container;
-
-    public function __construct($container)
+    public function __construct(public $container)
     {
-        $this->container = $container;
     }
 
     public function commitMessage()

diff --git a/src/Events/AssetContainerSaving.php b/src/Events/AssetContainerSaving.php
@@ -4,11 +4,8 @@
 
 class AssetContainerSaving extends Event
 {
-    public $container;
-
-    public function __construct($container)
+    public function __construct(public $container)
     {
-        $this->container = $container;
     }
 
     /**

diff --git a/src/Events/AssetCreated.php b/src/Events/AssetCreated.php
@@ -4,10 +4,7 @@
 
 class AssetCreated extends Event
 {
-    public $asset;
-
-    public function __construct($asset)
+    public function __construct(public $asset)
     {
-        $this->asset = $asset;
     }
 }
diff --git a/src/Events/AssetCreating.php b/src/Events/AssetCreating.php
@@ -4,11 +4,8 @@
 
 class AssetCreating extends Event
 {
-    public $asset;
-
-    public function __construct($asset)
+    public function __construct(public $asset)
     {
-        $this->asset = $asset;
     }
 
     /**

diff --git a/src/Events/AssetDeleted.php b/src/Events/AssetDeleted.php
@@ -6,11 +6,8 @@
 
 class AssetDeleted extends Event implements ProvidesCommitMessage
 {
-    public $asset;
-
-    public function __construct($asset)
+    public function __construct(public $asset)
     {
-        $this->asset = $asset;
     }
 
     public function commitMessage()

diff --git a/src/Events/AssetDeleting.php b/src/Events/AssetDeleting.php
@@ -4,11 +4,8 @@
 
 class AssetDeleting extends Event
 {
-    public $asset;
-
-    public function __construct($asset)
+    public function __construct(public $asset)
     {
-        $this->asset = $asset;
     }
 
     /**

diff --git a/src/Events/AssetFolderDeleted.php b/src/Events/AssetFolderDeleted.php
@@ -6,11 +6,8 @@
 
 class AssetFolderDeleted extends Event implements ProvidesCommitMessage
 {
-    public $folder;
-
-    public function __construct($folder)
+    public function __construct(public $folder)
     {
-        $this->folder = $folder;
     }
 
     public function commitMessage()

diff --git a/src/Events/AssetFolderSaved.php b/src/Events/AssetFolderSaved.php
@@ -6,11 +6,8 @@
 
 class AssetFolderSaved extends Event implements ProvidesCommitMessage
 {
-    public $folder;
-
-    public function __construct($folder)
+    public function __construct(public $folder)
     {
-        $this->folder = $folder;
     }
 
     public function commitMessage()

diff --git a/src/Events/AssetReferencesUpdated.php b/src/Events/AssetReferencesUpdated.php
@@ -6,11 +6,8 @@
 
 class AssetReferencesUpdated extends Event implements ProvidesCommitMessage
 {
-    public $asset;
-
-    public function __construct($asset)
+    public function __construct(public $asset)
     {
-        $this->asset = $asset;
     }
 
     public function commitMessage()

diff --git a/src/Events/AssetReplaced.php b/src/Events/AssetReplaced.php
@@ -4,12 +4,7 @@
 
 class AssetReplaced extends Event
 {
-    public $originalAsset;
-    public $newAsset;
-
-    public function __construct($originalAsset, $newAsset)
+    public function __construct(public $originalAsset, public $newAsset)
     {
-        $this->originalAsset = $originalAsset;
-        $this->newAsset = $newAsset;
     }
 }
diff --git a/src/Events/AssetReuploaded.php b/src/Events/AssetReuploaded.php
@@ -6,11 +6,8 @@
 
 class AssetReuploaded extends Event implements ProvidesCommitMessage
 {
-    public $asset;
-
-    public function __construct($asset)
+    public function __construct(public $asset)
     {
-        $this->asset = $asset;
     }
 
     public function commitMessage()

diff --git a/src/Events/AssetSaved.php b/src/Events/AssetSaved.php
@@ -6,11 +6,8 @@
 
 class AssetSaved extends Event implements ProvidesCommitMessage
 {
-    public $asset;
-
-    public function __construct($asset)
+    public function __construct(public $asset)
     {
-        $this->asset = $asset;
     }
 
     public function commitMessage()

diff --git a/src/Events/AssetSaving.php b/src/Events/AssetSaving.php
@@ -4,11 +4,8 @@
 
 class AssetSaving extends Event
 {
-    public $asset;
-
-    public function __construct($asset)
+    public function __construct(public $asset)
     {
-        $this->asset = $asset;
     }
 
     /**

diff --git a/src/Events/AssetUploaded.php b/src/Events/AssetUploaded.php
@@ -6,11 +6,8 @@
 
 class AssetUploaded extends Event implements ProvidesCommitMessage
 {
-    public $asset;
-
-    public function __construct($asset)
+    public function __construct(public $asset)
     {
-        $this->asset = $asset;
     }
 
     public function commitMessage()

diff --git a/src/Events/BlueprintCreated.php b/src/Events/BlueprintCreated.php
@@ -4,10 +4,7 @@
 
 class BlueprintCreated extends Event
 {
-    public $blueprint;
-
-    public function __construct($blueprint)
+    public function __construct(public $blueprint)
     {
-        $this->blueprint = $blueprint;
     }
 }
diff --git a/src/Events/BlueprintCreating.php b/src/Events/BlueprintCreating.php
@@ -4,11 +4,8 @@
 
 class BlueprintCreating extends Event
 {
-    public $blueprint;
-
-    public function __construct($blueprint)
+    public function __construct(public $blueprint)
     {
-        $this->blueprint = $blueprint;
     }
 
     /**

diff --git a/src/Events/BlueprintDeleted.php b/src/Events/BlueprintDeleted.php
@@ -6,11 +6,8 @@
 
 class BlueprintDeleted extends Event implements ProvidesCommitMessage
 {
-    public $blueprint;
-
-    public function __construct($blueprint)
+    public function __construct(public $blueprint)
     {
-        $this->blueprint = $blueprint;
     }
 
     public function commitMessage()

diff --git a/src/Events/BlueprintDeleting.php b/src/Events/BlueprintDeleting.php
@@ -4,11 +4,8 @@
 
 class BlueprintDeleting extends Event
 {
-    public $blueprint;
-
-    public function __construct($blueprint)
+    public function __construct(public $blueprint)
     {
-        $this->blueprint = $blueprint;
     }
 
     /**

diff --git a/src/Events/BlueprintReset.php b/src/Events/BlueprintReset.php
@@ -6,11 +6,8 @@
 
 class BlueprintReset extends Event implements ProvidesCommitMessage
 {
-    public $blueprint;
-
-    public function __construct($blueprint)
+    public function __construct(public $blueprint)
     {
-        $this->blueprint = $blueprint;
     }
 
     public function commitMessage()

diff --git a/src/Events/BlueprintSaved.php b/src/Events/BlueprintSaved.php
@@ -6,11 +6,8 @@
 
 class BlueprintSaved extends Event implements ProvidesCommitMessage
 {
-    public $blueprint;
-
-    public function __construct($blueprint)
+    public function __construct(public $blueprint)
     {
-        $this->blueprint = $blueprint;
     }
 
     public function commitMessage()

diff --git a/src/Events/BlueprintSaving.php b/src/Events/BlueprintSaving.php
@@ -4,11 +4,8 @@
 
 class BlueprintSaving extends Event
 {
-    public $blueprint;
-
-    public function __construct($blueprint)
+    public function __construct(public $blueprint)
     {
-        $this->blueprint = $blueprint;
     }
 
     /**

diff --git a/src/Events/CollectionCreated.php b/src/Events/CollectionCreated.php
@@ -4,10 +4,7 @@
 
 class CollectionCreated extends Event
 {
-    public $collection;
-
-    public function __construct($collection)
+    public function __construct(public $collection)
     {
-        $this->collection = $collection;
     }
 }
diff --git a/src/Events/CollectionCreating.php b/src/Events/CollectionCreating.php
@@ -4,11 +4,8 @@
 
 class CollectionCreating extends Event
 {
-    public $collection;
-
-    public function __construct($collection)
+    public function __construct(public $collection)
     {
-        $this->collection = $collection;
     }
 
     /**

diff --git a/src/Events/CollectionDeleted.php b/src/Events/CollectionDeleted.php
@@ -6,11 +6,8 @@
 
 class CollectionDeleted extends Event implements ProvidesCommitMessage
 {
-    public $collection;
-
-    public function __construct($collection)
+    public function __construct(public $collection)
     {
-        $this->collection = $collection;
     }
 
     public function commitMessage()

diff --git a/src/Events/CollectionDeleting.php b/src/Events/CollectionDeleting.php
@@ -4,11 +4,8 @@
 
 class CollectionDeleting extends Event
 {
-    public $collection;
-
-    public function __construct($collection)
+    public function __construct(public $collection)
     {
-        $this->collection = $collection;
     }
 
     /**