ittle fixes for phpstan, psalm and for the composer.json file

Author: mirko-pagliai

CHANGELOG.md

@@ -1,7 +1,8 @@
 # 2.x branch
 ## 2.10 branch
 ### 2.10.2
-* added tests for PHP 8.1.
+* added tests for PHP 8.1;
+* little fixes for phpstan, psalm and for the composer.json file.
 
 ### 2.10.1
 * stable version;

phpstan-baseline.neon

@@ -11,9 +11,9 @@ parameters:
 			path: src/TestSuite/TestCase.php
 
 		-
-			message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(\\)\\: mixed\\)\\|null, 'self\\:\\:delete' given\\.$#"
-			count: 2
-			path: src/Utility/BackupManager.php
+			message: "#^Property DatabaseBackup\\\\Test\\\\TestCase\\\\BackupTraitTest\\:\\:\\$Trait has no type specified\\.$#"
+			count: 1
+			path: tests/TestCase/BackupTraitTest.php
 
 		-
 			message: "#^Ternary operator condition is always true\\.$#"
@@ -25,3 +25,8 @@ parameters:
 			count: 2
 			path: tests/TestCase/Utility/BackupImportTest.php
 
+		-
+			message: "#^Ternary operator condition is always true\\.$#"
+			count: 2
+			path: tests/TestCase/Utility/BackupManagerTest.php
+

src/BackupTrait.php

@@ -72,6 +72,7 @@ public static function getDriver(?ConnectionInterface $connection = null): Drive
     {
         $connection = $connection ?: self::getConnection();
         $name = self::getDriverName($connection);
+        /** @var class-string<\DatabaseBackup\Driver\Driver> $Driver */
         $Driver = App::classname('DatabaseBackup.' . $name, 'Driver');
         Exceptionist::isTrue($Driver, __d('database_backup', 'The `{0}` driver does not exist', $name), InvalidArgumentException::class);
 

src/TestSuite/DriverTestCase.php

@@ -55,7 +55,7 @@ abstract class DriverTestCase extends TestCase
     protected $connection;
 
     /**
-     * @var array
+     * @var array<string>
      */
     public $fixtures = [
         'core.Articles',

src/Utility/BackupManager.php

@@ -59,7 +59,7 @@ public static function delete(string $filename): string
      */
     public static function deleteAll(): array
     {
-        return array_map('self::delete', self::index()->extract('filename')->toList());
+        return array_map([__CLASS__, 'delete'], self::index()->extract('filename')->toList());
     }
 
     /**
@@ -97,7 +97,7 @@ public static function rotate(int $rotate): array
     {
         Exceptionist::isPositive($rotate, __d('database_backup', 'Invalid rotate value'), InvalidArgumentException::class);
         $backupsToBeDeleted = self::index()->skip($rotate);
-        array_map('self::delete', $backupsToBeDeleted->extract('filename')->toList());
+        array_map([__CLASS__, 'delete'], $backupsToBeDeleted->extract('filename')->toList());
 
         return $backupsToBeDeleted->toList();
     }

tests/TestCase/BackupTraitTest.php

@@ -29,26 +29,40 @@
  */
 class BackupTraitTest extends TestCase
 {
-    use BackupTrait;
+    /**
+     * @psalm-var trait-string<\DatabaseBackup\BackupTrait>
+     */
+    protected $Trait;
 
     /**
      * Fixtures
-     * @var array
+     * @var array<string>
      */
     public $fixtures = [
         'core.Articles',
         'core.Comments',
     ];
 
+    /**
+     * Called before every test method
+     * @return void
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->Trait = $this->Trait ?: $this->getMockForTrait(BackupTrait::class);
+    }
+
     /**
      * Test for `getAbsolutePath()` method
      * @test
      */
     public function testGetAbsolutePath(): void
     {
         $expected = Configure::read('DatabaseBackup.target') . DS . 'file.txt';
-        $this->assertEquals($expected, $this->getAbsolutePath('file.txt'));
-        $this->assertEquals($expected, $this->getAbsolutePath(Configure::read('DatabaseBackup.target') . DS . 'file.txt'));
+        $this->assertEquals($expected, $this->Trait->getAbsolutePath('file.txt'));
+        $this->assertEquals($expected, $this->Trait->getAbsolutePath(Configure::read('DatabaseBackup.target') . DS . 'file.txt'));
     }
 
     /**
@@ -65,7 +79,7 @@ public function testGetCompression(): void
             'backup.sql.gz' => 'gzip',
             'text.txt' => null,
         ] as $filename => $expectedCompression) {
-            $this->assertEquals($expectedCompression, $this->getCompression($filename));
+            $this->assertEquals($expectedCompression, $this->Trait->getCompression($filename));
         }
     }
 
@@ -76,13 +90,13 @@ public function testGetCompression(): void
     public function testGetConnection(): void
     {
         foreach ([null, Configure::read('DatabaseBackup.connection')] as $name) {
-            $connection = $this->getConnection($name);
+            $connection = $this->Trait->getConnection($name);
             $this->assertInstanceof(Connection::class, $connection);
             $this->assertEquals('test', $connection->config()['name']);
         }
 
         ConnectionManager::setConfig('fake', ['url' => 'mysql://root:password@localhost/my_database']);
-        $connection = $this->getConnection('fake');
+        $connection = $this->Trait->getConnection('fake');
         $this->assertInstanceof(Connection::class, $connection);
         $this->assertEquals('fake', $connection->config()['name']);
 
@@ -98,18 +112,18 @@ public function testGetConnection(): void
     public function testGetDriver(): void
     {
         foreach ([ConnectionManager::get('test'), null] as $driver) {
-            $this->assertInstanceof(Driver::class, $this->getDriver($driver));
+            $this->assertInstanceof(Driver::class, $this->Trait->getDriver($driver));
         }
 
         //With a no existing driver
         $connection = $this->getMockBuilder(Connection::class)
-            ->setMethods(['__debuginfo', 'getDriver'])
+            ->onlyMethods(['__debuginfo', 'getDriver'])
             ->disableOriginalConstructor()
             ->getMock();
         $connection->method('getDriver')->will($this->returnValue(new Sqlserver()));
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('The `Sqlserver` driver does not exist');
-        $this->getDriver($connection);
+        $this->Trait->getDriver($connection);
     }
 
     /**
@@ -131,7 +145,7 @@ public function testGetExtension(): void
             'text' => null,
             '.txt' => null,
         ] as $filename => $expectedExtension) {
-            $this->assertEquals($expectedExtension, $this->getExtension($filename));
+            $this->assertEquals($expectedExtension, $this->Trait->getExtension($filename));
         }
     }
 
@@ -141,6 +155,6 @@ public function testGetExtension(): void
      */
     public function testGetValidCompressions(): void
     {
-        $this->assertNotEmpty($this->getValidCompressions());
+        $this->assertNotEmpty($this->Trait->getValidCompressions());
     }
 }

tests/TestCase/Utility/BackupManagerTest.php

@@ -51,8 +51,8 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->BackupExport = $this->BackupExport ?? new BackupExport();
-        $this->BackupManager = $this->BackupManager ?? new BackupManager();
+        $this->BackupExport = $this->BackupExport ?: new BackupExport();
+        $this->BackupManager = $this->BackupManager ?: new BackupManager();
     }
 
     /**