Merge branch 'main' into feature/safer_environments

Author: Outsidaz

config/anonymizer.php

@@ -16,4 +16,13 @@
     */
     'blocked_env' => ['production'],
     'force_blocked_env' => true,
+
+    /*
+    | Model Ordering
+    |--------------------------------------------------------------------------
+    |
+    | Optionally specify the order of anonymization, these Models will be anonymized first.
+    |
+    */
+    'ordered_models' => []
 ];

src/Anonymizable.php

@@ -10,8 +10,9 @@ trait Anonymizable
 {
     public function anonymizableCondition(): Builder
     {
-        return static::withTrashed();
+        return static::hasMacro('withTrashed') ? static::withTrashed() : static::query();
     }
+
     public function anonymizableAttributes(Generator $faker): array
     {
         throw new LogicException('Please implement the anonymizable method on your model.');

src/Commands/AnonymizerCommand.php

@@ -56,6 +56,26 @@ public function handle(): int
 
         $this->warn('Anonymization started');
 
+        $anonymizableClassesOrdered = collect(config('anonymizer.ordered_models') ?? [])
+            ->map(fn($ac) => '\\'.$ac);
+
+        $anonymizableClasses = collect($anonymizableClasses)
+            ->diff($anonymizableClassesOrdered)
+            ->toArray();
+
+        if (!empty($anonymizableClassesOrdered)) {
+            $this->warn('Order dependent models anonymizing.');
+        }
+        foreach ($anonymizableClassesOrdered as $anonymizableClass) {
+            $this->anonymizeTable(
+                new $anonymizableClass()
+            );
+        }
+
+        if (!empty($anonymizableClassesOrdered)) {
+            $this->warn('Remaining models anonymizing.');
+        }
+        $anonymizableClasses = collect($anonymizableClasses)->diff($anonymizableClassesOrdered)->all();
         foreach ($anonymizableClasses as $anonymizableClass) {
             $this->anonymizeTable(
                 new $anonymizableClass()
@@ -75,7 +95,10 @@ private function anonymizeTable(Model $model): void
 
         $progressBar = $this->output->createProgressBar($this->service->getCount($model));
 
-        $progressBar->setFormat('%current%/%max% [%bar%] %percent:3s%% | Remaining: %remaining:6s%');
+        $progressBar->setFormat('%current%/%max% [%bar%] %percent:3s%');
+        if($this->service->getCount($model)>0) {
+            $progressBar->setFormat('%current%/%max% [%bar%] %percent:3s%% | Remaining: %remaining:6s%');
+        }
 
         $this->service->getChunk($model, function (Collection $chunkItems) use ($progressBar) {
             DB::beginTransaction();