Merge pull request #56 from mirko-pagliai/develop

mirko-pagliai · web-flow · commit 9d46bc9a9dca · 2020-04-01T14:51:34.000+02:00
Develop
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Build Status](https://api.travis-ci.org/mirko-pagliai/cakephp-database-backup.svg?branch=master)](https://travis-ci.org/mirko-pagliai/cakephp-database-backup)
 [![Build status](https://ci.appveyor.com/api/projects/status/imerokwpvy0r51fj/branch/master?svg=true)](https://ci.appveyor.com/project/mirko-pagliai/cakephp-database-backup/branch/master)
 [![codecov](https://codecov.io/gh/mirko-pagliai/cakephp-database-backup/branch/master/graph/badge.svg)](https://codecov.io/gh/mirko-pagliai/cakephp-database-backup)
-[![CodeFactor](https://www.codefactor.io/repository/github/mirko-pagliai/cakephp-database-backup/badge/develop)](https://www.codefactor.io/repository/github/mirko-pagliai/cakephp-database-backup/overview/develop)
+[![CodeFactor](https://www.codefactor.io/repository/github/mirko-pagliai/cakephp-database-backup/badge)](https://www.codefactor.io/repository/github/mirko-pagliai/cakephp-database-backup)
 
 *DatabaseBackup* is a CakePHP plugin to export, import and manage database backups.
 Currently, the plugin supports *MySql*, *Postgres* and *Sqlite* databases.
@@ -22,10 +22,6 @@ You can install the plugin via composer:
 $ composer require --prefer-dist mirko-pagliai/cakephp-database-backup
 ```
 
-```bash
-$ composer require --prefer-dist mirko-pagliai/cakephp-assets:dev-cakephp3
-```
-
 Instead, the [cakephp3](//github.com/mirko-pagliai/cakephp-database-backup/tree/cakephp3)
 branch is compatible with all previous versions of CakePHP from version 3.5.1.
 In this case, you can install the package as well:
diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/BackupTrait.php b/src/BackupTrait.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Command/DeleteAllCommand.php b/src/Command/DeleteAllCommand.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Command/ExportCommand.php b/src/Command/ExportCommand.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Command/ImportCommand.php b/src/Command/ImportCommand.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Command/IndexCommand.php b/src/Command/IndexCommand.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Command/RotateCommand.php b/src/Command/RotateCommand.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Command/SendCommand.php b/src/Command/SendCommand.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Console/Command.php b/src/Console/Command.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Driver/Driver.php b/src/Driver/Driver.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Driver/Mysql.php b/src/Driver/Mysql.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Driver/Postgres.php b/src/Driver/Postgres.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Driver/Sqlite.php b/src/Driver/Sqlite.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/TestSuite/DriverTestCase.php b/src/TestSuite/DriverTestCase.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/TestSuite/TestCase.php b/src/TestSuite/TestCase.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
@@ -67,21 +68,20 @@ protected function createBackup(string $filename = 'backup.sql'): string
 
     /**
      * Internal method to creates some backup files
-     * @param bool $sleep If `true`, waits a second for each backup
      * @return array
      * @uses createBackup()
      */
-    protected function createSomeBackups(bool $sleep = false): array
+    protected function createSomeBackups(): array
     {
-        $files[] = $this->createBackup();
-
-        $sleep ? sleep(1) : null;
-        $files[] = $this->createBackup('backup.sql.bz2');
+        $timestamp = time();
 
-        $sleep ? sleep(1) : null;
-        $files[] = $this->createBackup('backup.sql.gz');
+        foreach (['sql.gz', 'sql.bz2', 'sql'] as $extension) {
+            $file = $this->createBackup('backup_test_' . (string)$timestamp . '.' . $extension);
+            touch($file, $timestamp--);
+            $files[] = $file;
+        }
 
-        return $files;
+        return array_reverse($files);
     }
 
     /**
diff --git a/src/Utility/BackupExport.php b/src/Utility/BackupExport.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Utility/BackupImport.php b/src/Utility/BackupImport.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/src/Utility/BackupManager.php b/src/Utility/BackupManager.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/tests/Fixture/Postgres/ArticlesFixture.php b/tests/Fixture/Postgres/ArticlesFixture.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/tests/Fixture/Postgres/CommentsFixture.php b/tests/Fixture/Postgres/CommentsFixture.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/tests/Fixture/Sqlite/ArticlesFixture.php b/tests/Fixture/Sqlite/ArticlesFixture.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/tests/Fixture/Sqlite/CommentsFixture.php b/tests/Fixture/Sqlite/CommentsFixture.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/tests/TestCase/BackupTraitTest.php b/tests/TestCase/BackupTraitTest.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
diff --git a/tests/TestCase/Command/DeleteAllCommandTest.php b/tests/TestCase/Command/DeleteAllCommandTest.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
@@ -23,26 +24,36 @@ class DeleteAllCommandTest extends TestCase
 {
     use ConsoleIntegrationTestTrait;
 
+    /**
+     * @var string
+     */
+    protected $command = 'database_backup.delete_all -v';
+
     /**
      * Test for `execute()` method
      * @test
      */
     public function testExecute()
     {
-        $command = 'database_backup.delete_all -v';
+        $files = $this->createSomeBackups();
+        $this->exec($this->command);
+        $this->assertExitWithSuccess();
+        foreach ($files as $file) {
+            $this->assertOutputContains('Backup `' . basename($file) . '` has been deleted');
+        }
+        $this->assertOutputContains('<success>Deleted backup files: 3</success>');
+    }
 
-        $this->exec($command);
+    /**
+     * Test for `execute()` method, with no backups
+     * @test
+     */
+    public function testExecuteNoBackups()
+    {
+        $this->exec($this->command);
         $this->assertExitWithSuccess();
         $this->assertOutputContains('Connection: test');
         $this->assertOutputContains('Driver: Mysql');
         $this->assertOutputContains('No backup has been deleted');
-
-        $this->createSomeBackups(true);
-        $this->exec($command);
-        $this->assertExitWithSuccess();
-        $this->assertOutputContains('Backup `backup.sql.gz` has been deleted');
-        $this->assertOutputContains('Backup `backup.sql.bz2` has been deleted');
-        $this->assertOutputContains('Backup `backup.sql` has been deleted');
-        $this->assertOutputContains('<success>Deleted backup files: 3</success>');
     }
 }
diff --git a/tests/TestCase/Command/ExportCommandTest.php b/tests/TestCase/Command/ExportCommandTest.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types=1);
+
 /**
  * This file is part of cakephp-database-backup.
  *
@@ -13,7 +14,6 @@
  */
 namespace DatabaseBackup\Test\TestCase\Command;
 
-use Cake\Core\Configure;
 use DatabaseBackup\TestSuite\TestCase;
 use MeTools\TestSuite\ConsoleIntegrationTestTrait;
 
@@ -24,51 +24,79 @@ class ExportCommandTest extends TestCase
 {
     use ConsoleIntegrationTestTrait;
 
+    /**
+     * @var string
+     */
+    protected $command = 'database_backup.export -v';
+
     /**
      * Test for `execute()` method
      * @test
      */
     public function testExecute()
     {
-        $command = 'database_backup.export -v';
-        $targetRegex = preg_quote(Configure::read('DatabaseBackup.target') . DS, '/');
-
-        //Exports, without params
-        $this->exec($command);
+        $this->exec($this->command);
         $this->assertExitWithSuccess();
         $this->assertOutputContains('Connection: test');
         $this->assertOutputContains('Driver: Mysql');
-        $this->assertOutputRegExp('/Backup `' . $targetRegex . 'backup_test_\d+\.sql` has been exported/');
+        $this->assertOutputRegExp('/Backup `[\w\-\/\:\\\\]+backup_test_\d+\.sql` has been exported/');
+    }
 
-        //Exports, with `compression` param
-        sleep(1);
-        $this->exec($command . ' --compression bzip2');
+    /**
+     * Test for `execute()` method, with `compression` param
+     * @test
+     */
+    public function testExecuteCompressionParam()
+    {
+        $this->exec($this->command . ' --compression bzip2');
         $this->assertExitWithSuccess();
-        $this->assertOutputRegExp('/Backup `' . $targetRegex . 'backup_test_\d+\.sql\.bz2` has been exported/');
+        $this->assertOutputRegExp('/Backup `[\w\-\/\:\\\\]+backup_test_\d+\.sql\.bz2` has been exported/');
+    }
 
-        //Exports, with `filename` param
-        sleep(1);
-        $this->exec($command . ' --filename backup.sql');
+    /**
+     * Test for `execute()` method, with `filename` param
+     * @test
+     */
+    public function testExecuteFilenameParam()
+    {
+        $this->exec($this->command . ' --filename backup.sql');
         $this->assertExitWithSuccess();
-        $this->assertOutputRegExp('/Backup `' . $targetRegex . 'backup.sql` has been exported/');
+        $this->assertOutputRegExp('/Backup `[\w\-\/\:\\\\]+backup.sql` has been exported/');
+    }
 
-        //Exports, with `rotate` param
-        sleep(1);
-        $this->exec($command . ' --rotate 3 -v');
+    /**
+     * Test for `execute()` method, with `rotate` param
+     * @test
+     */
+    public function testExecuteRotateParam()
+    {
+        $files = $this->createSomeBackups();
+        $this->exec($this->command . ' --rotate 3 -v');
         $this->assertExitWithSuccess();
-        $this->assertOutputRegExp('/Backup `' . $targetRegex . 'backup_test_\d+\.sql` has been exported/');
-        $this->assertOutputRegExp('/Backup `backup_test_\d+\.sql` has been deleted/');
+        $this->assertOutputRegExp('/Backup `[\w\-\/\:\\\\]+backup_test_\d+\.sql` has been exported/');
+        $this->assertOutputContains('Backup `' . basename(array_value_first($files)) . '` has been deleted');
         $this->assertOutputContains('<success>Deleted backup files: 1</success>');
+    }
 
-        //Exports, with `send` param
-        sleep(1);
-        $this->exec($command . ' --send mymail@example.com');
+    /**
+     * Test for `execute()` method, with `send` param
+     * @test
+     */
+    public function testExecuteSendParam()
+    {
+        $this->exec($this->command . ' --send mymail@example.com');
         $this->assertExitWithSuccess();
-        $this->assertOutputRegExp('/Backup `' . $targetRegex . 'backup_test_\d+\.sql` has been exported/');
-        $this->assertOutputRegExp('/Backup `' . $targetRegex . 'backup_test_\d+\.sql` was sent via mail/');
+        $this->assertOutputRegExp('/Backup `[\w\-\/\:\\\\]+backup_test_\d+\.sql` has been exported/');
+        $this->assertOutputRegExp('/Backup `[\w\-\/\:\\\\]+backup_test_\d+\.sql` was sent via mail/');
+    }
 
-        //With an invalid option value
-        $this->exec($command . ' --filename /noExistingDir/backup.sql');
+    /**
+     * Test for `execute()` method, with an invalid option value
+     * @test
+     */
+    public function testExecuteInvalidOptionValue()
+    {
+        $this->exec($this->command . ' --filename /noExistingDir/backup.sql');
         $this->assertExitWithError();
     }
 }
diff --git a/tests/TestCase/Command/ImportCommandTest.php b/tests/TestCase/Command/ImportCommandTest.php
diff --git a/tests/TestCase/Command/IndexCommandTest.php b/tests/TestCase/Command/IndexCommandTest.php
diff --git a/tests/TestCase/Command/RotateCommandTest.php b/tests/TestCase/Command/RotateCommandTest.php
diff --git a/tests/TestCase/Command/SendCommandTest.php b/tests/TestCase/Command/SendCommandTest.php
diff --git a/tests/TestCase/Driver/MysqlTest.php b/tests/TestCase/Driver/MysqlTest.php
diff --git a/tests/TestCase/Driver/PostgresTest.php b/tests/TestCase/Driver/PostgresTest.php
diff --git a/tests/TestCase/Driver/SqliteTest.php b/tests/TestCase/Driver/SqliteTest.php
diff --git a/tests/TestCase/I18nTest.php b/tests/TestCase/I18nTest.php
diff --git a/tests/TestCase/Utility/BackupExportTest.php b/tests/TestCase/Utility/BackupExportTest.php
diff --git a/tests/TestCase/Utility/BackupImportTest.php b/tests/TestCase/Utility/BackupImportTest.php
diff --git a/tests/TestCase/Utility/BackupManagerTest.php b/tests/TestCase/Utility/BackupManagerTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
diff --git a/tests/test_app/TestApp/Application.php b/tests/test_app/TestApp/Application.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`<?php`
	`2`	`+declare(strict_types=1);`
	`3`	`+`
`2`	`4`	`/**`
`3`	`5`	`* This file is part of cakephp-database-backup.`
`4`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`declare(strict_types=1);`
	`3`	`+`
`3`	`4`	`/**`
`4`	`5`	`* This file is part of cakephp-database-backup.`
`5`	`6`	`*`