Higher Rector presets to Improve type safety, clarity, and robustness

Modernize and harden nesting logic and configuration:

- Replace individual Rector level calls with withPreparedSets(...) in rector.php.
- Add declare(strict_types=1) to source and test stubs.
- Improve NestableCollection: add stricter type hints, rename parameters for clarity (item->model, collection->baseCollection), update method signatures (listsFlattened, listsFlattenedQualified, setParentsRecursive), and use explicit model checks.
- Tighten nesting logic: treat empty/'0' parentColumn as no-parent, use early continues when building parent/child relations, and add explicit closure return types.
- Add return type for newCollection in NestableTrait.
- Small test change: use consistent string concatenation for generated titles.

These changes improve type safety, clarity, and robustness of tree-building behavior and align the project with Rector presets.

Author: sdebacker

rector.php

@@ -11,6 +11,14 @@
     ])
     // uncomment to reach your current PHP version
     ->withPhpSets()
-    ->withTypeCoverageLevel(10)
-    ->withDeadCodeLevel(10)
-    ->withCodeQualityLevel(10);
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        codingStyle: true,
+        typeDeclarations: true,
+        privatization: true,
+        naming: true,
+        instanceOf: true,
+        earlyReturn: true,
+        rectorPreset: true,
+    );

src/NestableCollection.php

@@ -1,12 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * (c) Samuel De Backer <sdebacker@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace TypiCMS;
 
 use Illuminate\Database\Eloquent\Collection;
@@ -76,7 +77,7 @@ public function noCleaning(): self
     /** @return self<TKey, TModel> */
     public function nest(): self
     {
-        if (! $this->parentColumn) {
+        if ($this->parentColumn === '' || $this->parentColumn === '0') {
             return $this;
         }
 
@@ -95,10 +96,10 @@ public function nest(): self
         return $this;
     }
 
-    public function anAncestorIsMissing(Model $item): bool
+    public function anAncestorIsMissing(Model $model): bool
     {
         /** @var int|string|null $parentId */
-        $parentId = $item->{$this->parentColumn};
+        $parentId = $model->{$this->parentColumn};
 
         if (! $parentId) {
             return false;
@@ -115,23 +116,23 @@ public function anAncestorIsMissing(Model $item): bool
     }
 
     /**
-     * @param  BaseCollection<array-key, Model>|null  $collection
+     * @param BaseCollection<array-key, Model>|null $baseCollection
      * @param  array<int|string, string>  $flattened
      * @return array<int|string, string>
      */
     public function listsFlattened(
         string $column = 'title',
-        ?BaseCollection $collection = null,
+        ?BaseCollection $baseCollection = null,
         int $level = 0,
         array &$flattened = [],
         ?string $indentChars = null,
         mixed $parentString = null,
     ): array {
-        $collection ??= $this;
+        $baseCollection ??= $this;
         $indentChars ??= $this->indentChars;
 
         /** @var Model $item */
-        foreach ($collection as $item) {
+        foreach ($baseCollection as $item) {
             $itemString = $this->buildFlattenedLabel($item, $column, $indentChars, $level, $parentString);
             /** @var int|string $key */
             $key = $item->getKey();
@@ -156,18 +157,18 @@ public function listsFlattened(
     }
 
     /**
-     * @param  BaseCollection<array-key, Model>|null  $collection
+     * @param BaseCollection<array-key, Model>|null $baseCollection
      * @param  array<int|string, string>  $flattened
      * @return array<int|string, string>
      */
     public function listsFlattenedQualified(
         string $column = 'title',
-        ?BaseCollection $collection = null,
+        ?BaseCollection $baseCollection = null,
         int $level = 0,
         array &$flattened = [],
         ?string $indentChars = null,
     ): array {
-        return $this->listsFlattened($column, $collection, $level, $flattened, $indentChars, true);
+        return $this->listsFlattened($column, $baseCollection, $level, $flattened, $indentChars, true);
     }
 
     public function total(): int
@@ -200,7 +201,7 @@ protected function initializeChildrenCollections(): void
     protected function rejectOrphans(): static
     {
         /** @var static */
-        return $this->reject(fn($item) => $item->{$this->parentColumn} && $this->anAncestorIsMissing($item));
+        return $this->reject(fn($item): bool => $item->{$this->parentColumn} && $this->anAncestorIsMissing($item));
     }
 
     /**
@@ -213,10 +214,12 @@ protected function assignChildrenToParents(self|BaseCollection $collection): arr
 
         /** @var Model $item */
         foreach ($collection as $item) {
-            if (! $item->{$this->parentColumn} || ! isset($collection[$item->{$this->parentColumn}])) {
+            if (! $item->{$this->parentColumn}) {
+                continue;
+            }
+            if (! isset($collection[$item->{$this->parentColumn}])) {
                 continue;
             }
-
             /** @var BaseCollection<array-key, Model> $parentChildren */
             $parentChildren = $collection[$item->{$this->parentColumn}]->{$this->childrenName};
             $parentChildren->push($item);
@@ -227,14 +230,14 @@ protected function assignChildrenToParents(self|BaseCollection $collection): arr
     }
 
     protected function buildFlattenedLabel(
-        Model $item,
+        Model $model,
         string $column,
         string $indentChars,
         int $level,
         mixed $parentString,
     ): string {
         /** @var string $value */
-        $value = $item->{$column};
+        $value = $model->{$column};
 
         if (! $parentString) {
             return str_repeat($indentChars, $level).$value;
@@ -248,13 +251,13 @@ protected function buildFlattenedLabel(
         return $parentString.$indentChars.$value;
     }
 
-    /** @param BaseCollection<array-key, Model> $items */
-    protected function setParentsRecursive(BaseCollection $items, ?Model $parent = null): void
+    /** @param BaseCollection<array-key, Model> $baseCollection */
+    protected function setParentsRecursive(BaseCollection $baseCollection, ?Model $model = null): void
     {
         /** @var Model $item */
-        foreach ($items as $item) {
-            if ($parent) {
-                $item->setRelation($this->parentRelation, $parent);
+        foreach ($baseCollection as $item) {
+            if ($model instanceof \Illuminate\Database\Eloquent\Model) {
+                $item->setRelation($this->parentRelation, $model);
             }
 
             /** @var BaseCollection<array-key, Model> $children */

src/NestableTrait.php

@@ -1,15 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace TypiCMS;
 
 trait NestableTrait
 {
     /**
      * Return a custom nested collection.
-     *
-     * @return NestableCollection
      */
-    public function newCollection(array $models = [])
+    public function newCollection(array $models = []): \TypiCMS\NestableCollection
     {
         return new NestableCollection($models);
     }

tests/Stubs/Item.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Stubs;
 
 use Illuminate\Database\Eloquent\Model;

tests/Unit/NestableCollectionTest.php

@@ -9,7 +9,7 @@ function makeItem(int $id, ?int $parentId = null, string $title = ''): Item
     $item = new Item;
     $item->id = $id;
     $item->parent_id = $parentId;
-    $item->title = $title ?: "Item {$id}";
+    $item->title = $title ?: 'Item ' . $id;
 
     return $item;
 }