Merge pull request #12 from mirko-pagliai/develop

Develop

CHANGELOG.md

@@ -1,5 +1,9 @@
 # 2.x branch
 ## 2.1 branch
+### 2.1.4
+* when a backup is sent by mail, the mimetype is forced;
+* fixed some tests.
+
 ### 2.1.3
 * added `createBackup()` and `createSomeBackups()` to the `TestCase` class;
 * `BackupManager::_send()` has become `getEmailInstance()`.

README.md

@@ -7,14 +7,19 @@
 *DatabaseBackup* is a CakePHP plugin to export, import and manage database backups.  
 Currently, the plugin supports *MySql*, *Postgres* and *Sqlite* databases.
 
-**NOTE**: this plugin requires at least version 3.4 of CakePHP.
-
 ## Installation
 You can install the plugin via composer:
 
     $ composer require --prefer-dist mirko-pagliai/cakephp-database-backup
+
+**NOTE**: the package may require one of the latest versions version of CakePHP.  
+Instead, the [cakephp3.2](//github.com/mirko-pagliai/cakephp-database-backup/tree/cakephp3.2)
+branch is compatible with CakePHP versions from 3.2 onwards.  
+In this case, you can install the package as well:
+
+    $ composer require --prefer-dist mirko-pagliai/cakephp-database-backup:dev-cakephp3.2
 
-Then you have to edit `APP/config/bootstrap.php` to load the plugin:
+After installation, you have to edit `APP/config/bootstrap.php` to load the plugin:
 
     Plugin::load('DatabaseBackup', ['bootstrap' => true]);
 

src/TestSuite/DriverTestCase.php

@@ -62,6 +62,7 @@ public function setUp()
 
         $connection = $this->getConnection();
 
+        TableRegistry::clear();
         $this->Articles = TableRegistry::get('Articles', compact('connection'));
         $this->Comments = TableRegistry::get('Comments', compact('connection'));
 

src/Utility/BackupManager.php

@@ -142,7 +142,10 @@ protected function getEmailInstance($backup, $recipient)
             ->setFrom($sender)
             ->setTo($recipient)
             ->setSubject(__d('database_backup', 'Database backup {0} from {1}', basename($backup), env('SERVER_NAME', 'localhost')))
-            ->setAttachments($backup);
+            ->setAttachments([basename($backup) => [
+                'file' => $backup,
+                'mimetype' => mime_content_type($backup),
+            ]]);
     }
 
     /**

tests/TestCase/Driver/MysqlTest.php

@@ -12,6 +12,7 @@
  */
 namespace DatabaseBackup\Test\TestCase\Driver;
 
+use Cake\Datasource\ConnectionManager;
 use DatabaseBackup\BackupTrait;
 use DatabaseBackup\Driver\Mysql;
 use DatabaseBackup\TestSuite\DriverTestCase;
@@ -122,7 +123,10 @@ public function testBeforeExport()
 
         $this->Driver->beforeExport();
 
-        $expected = '[mysqldump]' . PHP_EOL . 'user=travis' . PHP_EOL . 'password=""' . PHP_EOL . 'host=localhost';
+        $expected = '[mysqldump]' . PHP_EOL .
+            'user=' . ConnectionManager::config('test')['username'] . PHP_EOL .
+            'password=""' . PHP_EOL .
+            'host=localhost';
         $auth = $this->getProperty($this->Driver, 'auth');
         $this->assertFileExists($auth);
         $this->assertEquals($expected, file_get_contents($auth));
@@ -140,7 +144,10 @@ public function testBeforeImport()
 
         $this->Driver->beforeImport();
 
-        $expected = '[client]' . PHP_EOL . 'user=travis' . PHP_EOL . 'password=""' . PHP_EOL . 'host=localhost';
+        $expected = '[client]' . PHP_EOL .
+            'user=' . ConnectionManager::config('test')['username'] . PHP_EOL .
+            'password=""' . PHP_EOL .
+            'host=localhost';
         $auth = $this->getProperty($this->Driver, 'auth');
         $this->assertFileExists($auth);
         $this->assertEquals($expected, file_get_contents($auth));

tests/TestCase/Shell/BackupShellTest.php

@@ -86,11 +86,8 @@ public function testWelcome()
     {
         $this->invokeMethod($this->BackupShell, '_welcome');
 
-        $messages = $this->out->messages();
-
-        $this->assertRegExp('/^Connection: test/', $messages[6]);
-        $this->assertEquals('Driver: Mysql', $messages[7]);
-        $this->assertRegExp('/^\-+$/', $messages[8]);
+        $this->assertContains('Connection: test', $this->out->messages());
+        $this->assertContains('Driver: Mysql', $this->out->messages());
     }
 
     /**
@@ -371,7 +368,7 @@ public function testGetOptionParser()
 
         $this->assertInstanceOf('Cake\Console\ConsoleOptionParser', $parser);
         $this->assertEquals([
-            'deleteAll',
+            'delete_all',
             'export',
             'import',
             'index',

tests/bootstrap.php

@@ -90,8 +90,8 @@
     ],
 ]);
 
-ConnectionManager::setConfig('test', ['url' => 'mysql://travis@localhost/test']);
-ConnectionManager::setConfig('test_sqlite', ['url' => 'sqlite:\\' . TMP . 'example.sq3']);
+ConnectionManager::setConfig('test', ['url' => 'mysql://root@localhost/test']);
+ConnectionManager::setConfig('test_sqlite', ['url' => 'sqlite:///' . TMP . 'example.sq3']);
 ConnectionManager::setConfig('test_postgres', ['url' => 'postgres://postgres@localhost/travis_ci_test']);
 
 Configure::write('DatabaseBackup.connection', 'test');

version

@@ -1 +1 @@
-2.1.3
+2.1.4