Cleanup (#453)

Author: vjik

src/Event/AbstractEvent.php

@@ -22,16 +22,9 @@ abstract class AbstractEvent implements StoppableEventInterface
     /**
      * @param ActiveRecordInterface $model The target model associated with this event.
      */
-    public function __construct(private readonly ActiveRecordInterface $model)
-    {
-    }
-
-    /**
-     * @return ActiveRecordInterface The target model associated with this event.
-     */
-    public function getModel(): ActiveRecordInterface
-    {
-        return $this->model;
+    public function __construct(
+        public readonly ActiveRecordInterface $model,
+    ) {
     }
 
     /**

src/Event/AfterCreateQuery.php

@@ -16,7 +16,7 @@ final class AfterCreateQuery extends AbstractEvent
 {
     public function __construct(
         ActiveRecordInterface $model,
-        public ActiveQueryInterface &$query,
+        public readonly ActiveQueryInterface $query,
     ) {
         parent::__construct($model);
     }

src/Event/BeforeCreateQuery.php

@@ -13,9 +13,4 @@
  */
 final class BeforeCreateQuery extends AbstractEvent
 {
-    public function __construct(
-        ActiveRecordInterface $model,
-    ) {
-        parent::__construct($model);
-    }
 }

src/Event/Handler/DefaultValue.php

@@ -35,7 +35,7 @@ public function getEventHandlers(): array
 
     private function afterPopulate(AfterPopulate $event): void
     {
-        $model = $event->getModel();
+        $model = $event->model;
         $value = is_callable($this->value) ? ($this->value)($event) : $this->value;
 
         foreach ($this->getPropertyNames() as $propertyName) {

src/Event/Handler/DefaultValueOnInsert.php

@@ -36,7 +36,7 @@ public function getEventHandlers(): array
 
     private function beforeInsert(BeforeInsert $event): void
     {
-        $model = $event->getModel();
+        $model = $event->model;
         $value = is_callable($this->value) ? ($this->value)($event) : $this->value;
 
         foreach ($this->getPropertyNames() as $propertyName) {
@@ -48,7 +48,7 @@ private function beforeInsert(BeforeInsert $event): void
 
     private function beforeUpsert(BeforeUpsert $event): void
     {
-        $model = $event->getModel();
+        $model = $event->model;
         $value = is_callable($this->value) ? ($this->value)($event) : $this->value;
 
         foreach ($this->getPropertyNames() as $propertyName) {

src/Event/Handler/SetValueOnUpdate.php

@@ -35,7 +35,7 @@ public function getEventHandlers(): array
 
     private function beforeUpdate(BeforeUpdate $event): void
     {
-        $model = $event->getModel();
+        $model = $event->model;
         $value = is_callable($this->value) ? ($this->value)($event) : $this->value;
 
         foreach ($this->getPropertyNames() as $propertyName) {
@@ -47,7 +47,7 @@ private function beforeUpdate(BeforeUpdate $event): void
 
     private function beforeUpsert(BeforeUpsert $event): void
     {
-        $model = $event->getModel();
+        $model = $event->model;
         $value = is_callable($this->value) ? ($this->value)($event) : $this->value;
 
         $updateProperties = match ($event->updateProperties) {

src/Event/Handler/SoftDelete.php

@@ -10,6 +10,8 @@
 use Yiisoft\ActiveRecord\Event\BeforeDelete;
 use Yiisoft\Db\QueryBuilder\Condition\Equals;
 
+use function is_callable;
+
 /**
  * Attribute for implementing soft deletion in Active Record models. Instead of deleting records from the
  * database, it sets a value of the date and time for properties to indicate that the record has been logically deleted.
@@ -43,7 +45,7 @@ public function getEventHandlers(): array
 
     private function afterCreateQuery(AfterCreateQuery $event): void
     {
-        $model = $event->getModel();
+        $model = $event->model;
         $tableName = $model->tableName();
 
         foreach ($this->getPropertyNames() as $propertyName) {
@@ -55,7 +57,7 @@ private function afterCreateQuery(AfterCreateQuery $event): void
 
     private function beforeDelete(BeforeDelete $event): void
     {
-        $model = $event->getModel();
+        $model = $event->model;
         $value = is_callable($this->value) ? ($this->value)($event) : $this->value;
 
         $propertyValues = [];