rename vars

Author: mvorisek

src/Form/Control/TheirChanges.php

@@ -24,11 +24,11 @@ class TheirChanges
     /**
      * @param array<string, mixed> $oldData
      */
-    protected function loadEntity(Model $ourModelOrEntity, array $oldData): Model
+    protected function loadEntity(Model $modelOrEntity, array $oldData): Model
     {
-        $entity = $ourModelOrEntity->isEntity()
-            ? $ourModelOrEntity
-            : $ourModelOrEntity->load($oldData[$ourModelOrEntity->idField]);
+        $entity = $modelOrEntity->isEntity()
+            ? $modelOrEntity
+            : $modelOrEntity->load($oldData[$modelOrEntity->idField]);
 
         foreach ($oldData as $k => $v) {
             if (!$entity->compare($k, $v)) {
@@ -43,30 +43,30 @@ protected function loadEntity(Model $ourModelOrEntity, array $oldData): Model
         return $entity;
     }
 
-    public function saveTo(Model $ourModelOrEntity): void
+    public function saveTo(Model $theirModelOrEntity): void
     {
-        $ourModelOrEntity->atomic(function () use ($ourModelOrEntity) {
+        $theirModelOrEntity->atomic(function () use ($theirModelOrEntity) {
             foreach ($this->deletes as $oldData) {
-                $entity = $this->loadEntity($ourModelOrEntity, $oldData);
+                $entity = $this->loadEntity($theirModelOrEntity, $oldData);
 
                 $entity->delete();
             }
 
             foreach ($this->updates as [$oldData, $newData]) {
-                $entity = $this->loadEntity($ourModelOrEntity, $oldData);
+                $entity = $this->loadEntity($theirModelOrEntity, $oldData);
 
                 $entity->setMulti($newData);
                 $entity->save();
             }
 
             foreach ($this->inserts as $newData) {
-                $entity = $ourModelOrEntity->isEntity()
-                    ? $ourModelOrEntity
-                    : $ourModelOrEntity->createEntity();
-                $this->loadEntity($entity, [$ourModelOrEntity->idField => null]);
+                $entity = $theirModelOrEntity->isEntity()
+                    ? $theirModelOrEntity
+                    : $theirModelOrEntity->createEntity();
+                $this->loadEntity($entity, [$theirModelOrEntity->idField => null]);
 
-                if (($newData[$ourModelOrEntity->idField] ?? null) === null) {
-                    unset($newData[$ourModelOrEntity->idField]);
+                if (($newData[$theirModelOrEntity->idField] ?? null) === null) {
+                    unset($newData[$theirModelOrEntity->idField]);
                 }
 
                 $entity->setMulti($newData);