2 files changed, 12 insertions, 27 deletions

diff --git a/src/model/Position.php b/src/model/Position.php
index 76de966..b5040df 100644
--- a/src/model/Position.php
+++ b/src/model/Position.php
@@ -7,9 +7,9 @@ declare(strict_types=1);
 
 trait Position
 {
+    // tri par insertion du tableau des enfants
         public function sortChildren(bool $reindexation = false): void
     {
-        // tri par insertion du tableau des enfants
         for($i = 1; $i < count($this->children); $i++)
         {
             $tmp = $this->children[$i];
@@ -29,31 +29,18 @@ trait Position
             }
         }
 
-        // nouvelles positions (tableau $children => BDD)
         if($reindexation){
-            $i = 1;
-            foreach($this->children as $child){
-                $child->setPosition($i);
-                $i++;
-            }
+            $this->reindex();
         }
     }
 
-    /*private function sortChildren(): void
+    // nouvelles positions (tableau $children => BDD)
+    public function reindex(): void
     {
-        $iteration = count($this->children);
-        while($iteration > 1)
-        {
-            for($i = 0; $i < $iteration - 1; $i++)
-            {
-                if($this->children[$i]->getPosition() > $this->children[$i + 1]->getPosition())
-                {
-                    $tmp = $this->children[$i];
-                    $this->children[$i] = $this->children[$i + 1];
-                    $this->children[$i + 1] = $tmp;
-                }
-            }
-            $iteration--;
+        $i = 1;
+        foreach($this->children as $child){
+            $child->setPosition($i);
+            $i++;
         }
-    }*/
+    }
 }
\ No newline at end of file
diff --git a/src/model/entities/Page.php b/src/model/entities/Page.php
index aaff1ff..9564342 100644
--- a/src/model/entities/Page.php
+++ b/src/model/entities/Page.php
@@ -135,11 +135,9 @@ class Page
     }
     public function removeChild(self $child): void
     {
-        foreach($this->children as $index => $candidate){
-            if($candidate === $child){
-                unset($this->children[$index]);
-            }
-        }
+        $this->children->removeElement($child);
+        $this->children = new ArrayCollection(array_values($this->children->toArray())); // réindexer en passant par un tableau
+        $this->sortChildren(false);
     }
 
     public function findPageById(int $id): ?Page