improved BackuManager::index() method, also regarding the correct files sorting. This also solves a small bug for

  the `rotate()` method (which precisely affects `index()`)

Author: mirko-pagliai

CHANGELOG.md

@@ -6,7 +6,8 @@
 * some, possible changes that prepare it for CakePHP 5 and PHPUnit 10 ([issue #97](https://github.com/mirko-pagliai/cakephp-database-backup/issues/97));
 * little fixes. Fixed some deprecations for CakePHP 4.5 ([issue #97](https://github.com/mirko-pagliai/cakephp-database-backup/issues/97));
 * improved `BackuManager::index()` method, also regarding the correct files sorting. This also solves a small bug for
-  the `rotate()` method (which precisely affects `index()`);
+  the `rotate()` method (which precisely affects `index()`). The `index()` method now returns a collection of arrays (
+  and no longer a collection of `Entity`);
 * some testing methods that have been missing for a long time have been added;
 * the `BackupTrait::getDriverName()` method can no longer be static;
 * removed (old and useless) `BaseCommandTestCase` class;

psalm-baseline.xml

@@ -16,9 +16,4 @@
       <code>empty($this-&gt;Driver)</code>
     </TypeDoesNotContainType>
   </file>
-  <file src="src/Utility/BackupManager.php">
-    <TooManyTemplateParams occurrences="1">
-      <code>\Cake\Collection\CollectionInterface&lt;\Cake\ORM\Entity&gt;</code>
-    </TooManyTemplateParams>
-  </file>
 </files>

src/Command/IndexCommand.php

@@ -19,7 +19,6 @@
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOptionParser;
 use Cake\I18n\Number;
-use Cake\ORM\Entity;
 use DatabaseBackup\Console\Command;
 use DatabaseBackup\Utility\BackupManager;
 
@@ -63,11 +62,11 @@ public function execute(Arguments $args, ConsoleIo $io): void
             __d('database_backup', 'Size'),
             __d('database_backup', 'Datetime'),
         ];
-        $cells = $backups->map(fn(Entity $backup): array => $backup
-            ->set('compression', $backup->get('compression') ?: '')
-            ->set('datetime', $backup->get('datetime')->nice())
-            ->set('size', Number::toReadableSize($backup->get('size')))
-            ->toArray());
+        $cells = $backups->map(fn(array $backup): array => [
+           'compression' => $backup['compression'] ?: '',
+           'datetime' => $backup['datetime']->nice(),
+           'size' => Number::toReadableSize($backup['size']),
+       ] + $backup);
         $io->helper('table')->output(array_merge([$headers], $cells->toList()));
     }
 }

src/Command/RotateCommand.php

@@ -67,7 +67,7 @@ public function execute(Arguments $args, ConsoleIo $io): void
             }
 
             foreach ($files as $file) {
-                $io->verbose(__d('database_backup', 'Backup `{0}` has been deleted', $file->get('filename')));
+                $io->verbose(__d('database_backup', 'Backup `{0}` has been deleted', $file['filename']));
             }
 
             $io->success(__d('database_backup', 'Deleted backup files: {0}', count($files)));

src/Utility/BackupManager.php

@@ -20,7 +20,6 @@
 use Cake\Core\Configure;
 use Cake\I18n\FrozenTime;
 use Cake\Mailer\Mailer;
-use Cake\ORM\Entity;
 use DatabaseBackup\BackupTrait;
 use LogicException;
 use Symfony\Component\Finder\Finder;
@@ -65,7 +64,7 @@ public static function deleteAll(): array
 
     /**
      * Returns a list of database backups
-     * @return \Cake\Collection\CollectionInterface<\Cake\ORM\Entity> Backups
+     * @return \Cake\Collection\CollectionInterface Array of backups
      * @see https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupManager-utility#index
      */
     public static function index(): CollectionInterface
@@ -77,16 +76,13 @@ public static function index(): CollectionInterface
             ->sortByModifiedTime()
             ->reverseSorting();
 
-        return (new Collection($Finder))->map(function (SplFileInfo $File): Entity {
-            $filename = $File->getFilename();
-
-            return new Entity(compact('filename') + [
-                'extension' => self::getExtension($filename),
-                'compression' => self::getCompression($filename),
-                'size' => $File->getSize(),
-                'datetime' => FrozenTime::createFromTimestamp($File->getMTime()),
-            ]);
-        })->compile(false);
+        return (new Collection($Finder))->map(fn(SplFileInfo $File): array => [
+            'filename' => $File->getFilename(),
+            'extension' => self::getExtension($File->getFilename()),
+            'compression' => self::getCompression($File->getFilename()),
+            'size' => $File->getSize(),
+            'datetime' => FrozenTime::createFromTimestamp($File->getMTime()),
+        ])->compile(false);
     }
 
     /**

tests/TestCase/Utility/BackupManagerTest.php

@@ -17,7 +17,6 @@
 
 use Cake\Core\Configure;
 use Cake\I18n\FrozenTime;
-use Cake\ORM\Entity;
 use Cake\TestSuite\EmailTrait;
 use DatabaseBackup\TestSuite\TestCase;
 use DatabaseBackup\Utility\BackupExport;
@@ -111,9 +110,9 @@ public function testIndex(): void
 
         //Checks for properties of each backup object
         foreach ($files as $file) {
-            $this->assertInstanceOf(Entity::class, $file);
-            $this->assertGreaterThan(0, $file->get('size'));
-            $this->assertInstanceOf(FrozenTime::class, $file->get('datetime'));
+            $this->assertIsArray($file);
+            $this->assertGreaterThan(0, $file['size']);
+            $this->assertInstanceOf(FrozenTime::class, $file['datetime']);
         }
     }
 
@@ -139,7 +138,11 @@ public function testRotate(): void
         $this->assertSame(['bzip2', 'gzip'], $filesAfterRotate->extract('compression')->toList());
 
         //Gets the difference
-        $diff = array_udiff($initialFiles->toList(), $filesAfterRotate->toList(), fn(Entity $first, Entity $second): int => strcmp($first->get('filename'), $second->get('filename')));
+        $diff = array_udiff(
+            $initialFiles->toList(),
+            $filesAfterRotate->toList(),
+            fn(array $first, array $second): int => strcmp($first['filename'], $second['filename'])
+        );
 
         //Again, only 1 backup was deleted. The difference is the same
         $this->assertCount(1, $diff);