chore: better model class #64

scrawler-labs · Oct 8, 2024 · 2fdc692 · 2fdc692
1 parent 7dc7cf5
commit 2fdc692
Show file tree

Hide file tree

Showing 10 changed files with 311 additions and 229 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/Collection.php b/src/Collection.php
@@ -122,10 +122,10 @@ public function inits(): Collection
     }
 
     /**
-     * @param mixed[][] $sources
+     * @param array<mixed>|\Traversable<mixed> $sources
      * @return Collection
      */
-    public function merge(iterable...$sources): Collection
+    public function merge(iterable ...$sources): Collection
     {
         return new self($this->collection->merge(...$sources));
     }
@@ -192,7 +192,7 @@ public function last(): Collection
      */
     public function getIterator(): Iterator
     {
-        yield from$this->collection->getIterator();
+        yield from $this->collection->getIterator();
     }
     /**
      * @param int $index

diff --git a/src/Database.php b/src/Database.php
@@ -210,21 +210,17 @@ private function saveForeignOto(\Scrawler\Arca\Model $model): void
      */
     private function saveForeignOtm(\Scrawler\Arca\Model $model, mixed $id): void
     {
-        foreach ($model->getForeignModels('otm') as $foreigns) {
-            foreach ($foreigns as $foreign) {
+        foreach ($model->getForeignModels('otm') as $foreign) {
                 $key = $model->getName().'_id';
                 $foreign->$key = $id;
                 $this->createTables($foreign);
-            }
         }
         $this->connection->beginTransaction();
         try {
-            foreach ($model->getForeignModels('otm') as $foreigns) {
-                foreach ($foreigns as $foreign) {
+            foreach ($model->getForeignModels('otm') as $foreign) {
                     $this->createRecords($foreign);
                     $foreign->cleanModel();
                     $foreign->setLoaded();
-                }
             }
             $this->connection->commit();
         } catch (\Exception $e) {
@@ -242,8 +238,7 @@ private function saveForeignOtm(\Scrawler\Arca\Model $model, mixed $id): void
      */
     private function saveForeignMtm(\Scrawler\Arca\Model $model, mixed $id): void
     {
-        foreach ($model->getForeignModels('mtm') as $foreigns) {
-            foreach ($foreigns as $foreign) {
+        foreach ($model->getForeignModels('mtm') as $foreign) {
                 $model_id = $model->getName().'_id';
                 $foreign_id = $foreign->getName().'_id';
                 $relational_table = $this->create($model->getName().'_'.$foreign->getName());
@@ -256,12 +251,10 @@ private function saveForeignMtm(\Scrawler\Arca\Model $model, mixed $id): void
                 }
                 $this->createTables($relational_table);
                 $this->createTables($foreign);
-            }
         }
         $this->connection->beginTransaction();
         try {
-            foreach ($model->getForeignModels('mtm') as $foreigns) {
-                foreach ($foreigns as $foreign) {
+            foreach ($model->getForeignModels('mtm') as $foreign) {
                     $rel_id = $this->createRecords($foreign);
                     $foreign->cleanModel();
                     $foreign->setLoaded();
@@ -271,7 +264,6 @@ private function saveForeignMtm(\Scrawler\Arca\Model $model, mixed $id): void
                     $relational_table->$model_id = $id;
                     $relational_table->$foreign_id = $rel_id;
                     $this->createRecords($relational_table);
-                }
             }
             $this->connection->commit();
         } catch (\Exception $e) {