Develop (#44)

* improved exception message when no binary file is found

* no longer uses the `Folder` class

* updated

* fixed

* Develop dependencies (#42)

added tests for lower dependencies

* updated

* come back

* fixed

* fixed

* updated

* little fixes for `BackupManager` and `BackupExport` classes

* test

* fixed typo

* little fixes

* fixed

* updated

* fixed

* added badge

* some fixes

* uses `Filesystem` class

* come back

* fixed

Author: mirko-pagliai

.travis.yml

@@ -29,7 +29,7 @@ matrix:
 services:
   - mysql
   - postgresql
-  
+
 addons:
   postgresql: "9.4"
 
@@ -42,12 +42,12 @@ install:
 before_script:
   - mysql -e 'create database test;'
   - psql -c 'create database travis_ci_test;' -U postgres
-  
+
 script:
   - if [[ $PHPCS != '1' && $COVERAGE != '1' ]]; then vendor/bin/phpunit --exclude-group=onlyWindows; fi
   - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs --standard=phpcs.xml.dist; fi
   - if [[ $COVERAGE = 1 ]]; then vendor/bin/phpunit --exclude-group=onlyWindows --coverage-clover=clover.xml; fi
-  
+
 after_success:
   - if [[ $COVERAGE = 1 ]]; then bash <(curl -s https://codecov.io/bash); fi
 

README.md

@@ -4,6 +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)
 
 *DatabaseBackup* is a CakePHP plugin to export, import and manage database backups.  
 Currently, the plugin supports *MySql*, *Postgres* and *Sqlite* databases.
@@ -51,9 +52,9 @@ If you want to use a different directory, read below.
 
 ## Requirements
 *DatabaseBackup* requires:
-* `mysql` and `mysqldump` for *MySql* databases;
-* `pg_dump` and `pg_restore` for *Postgres* databases;
-* `sqlite3` for *Sqlite* databases.
+*   `mysql` and `mysqldump` for *MySql* databases;
+*   `pg_dump` and `pg_restore` for *Postgres* databases;
+*   `sqlite3` for *Sqlite* databases.
 
 **Optionally**, if you want to handle compressed backups, `bzip2` and `gzip` are 
 also required.
@@ -66,19 +67,19 @@ permission).
 
 ## Configuration
 The plugin uses some configuration parameters. See our wiki:
-* [Configuration](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/Configuration)
+*   [Configuration](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/Configuration)
 
 If you want to send backup files by email, remember to set up your application
 correctly so that it can send emails. For more information on how to configure
 your application, see the [Cookbook](https://book.cakephp.org/3.0/en/core-libraries/email.html#configuring-transports).
 
 ## How to use
 See our wiki:
-* [Export backups as cron jobs](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/Export-backups-as-cron-jobs)
-* [How to use the BackupExport utility](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupExport-utility)
-* [How to use the BackupImport utility](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupImport-utility)
-* [How to use the BackupManager utility](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupManager-utility)
-* [How to use the BackupShell](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupShell)
+*   [Export backups as cron jobs](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/Export-backups-as-cron-jobs)
+*   [How to use the BackupExport utility](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupExport-utility)
+*   [How to use the BackupImport utility](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupImport-utility)
+*   [How to use the BackupManager utility](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupManager-utility)
+*   [How to use the BackupShell](https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupShell)
 
 And refer to our [API](//mirko-pagliai.github.io/cakephp-database-backup).
 

appveyor.yml

@@ -27,7 +27,7 @@ before_test:
 
 install:
   - cd c:\
-  - curl -fsS -o php.zip https://windows.php.net/downloads/releases/php-7.2.21-nts-Win32-VC15-x86.zip
+  - curl -fsS -o php.zip https://windows.php.net/downloads/releases/php-7.2.22-nts-Win32-VC15-x86.zip
   - 7z x php.zip -oc:\php > nul
   - cd c:\php
   - copy php.ini-production php.ini

src/BackupTrait.php

@@ -18,6 +18,7 @@
 use Cake\Datasource\ConnectionManager;
 use InvalidArgumentException;
 use RuntimeException;
+use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * A trait that provides some methods used by all other classes
@@ -39,7 +40,7 @@ trait BackupTrait
      */
     public function getAbsolutePath($path)
     {
-        return is_absolute($path) ? $path : $this->getTarget() . DS . $path;
+        return (new Filesystem())->isAbsolutePath($path) ? $path : $this->getTarget() . DS . $path;
     }
 
     /**

src/Driver/Driver.php

@@ -145,14 +145,12 @@ protected function _exportExecutableWithCompression($filename)
      */
     protected function _importExecutableWithCompression($filename)
     {
-        $executable = $this->_importExecutable();
         $compression = $this->getCompression($filename);
         $filename = escapeshellarg($filename);
 
+        $executable = $this->_importExecutable() . ' < ' . $filename;
         if ($compression) {
-            $executable = sprintf('%s -dc %s | ', $this->getBinary($compression), $filename) . $executable;
-        } else {
-            $executable .= ' < ' . $filename;
+            $executable = sprintf('%s -dc %s | ', $this->getBinary($compression), $filename) . $this->_importExecutable();
         }
 
         if (Configure::read('DatabaseBackup.redirectStderrToDevNull')) {

tests/TestCase/Utility/BackupManagerTest.php

@@ -143,8 +143,8 @@ public function testRotate()
         $this->assertEquals(['gzip', 'bzip2'], $filesAfterRotate->extract('compression')->toList());
 
         //Gets the difference
-        $diff = array_udiff($initialFiles->toList(), $filesAfterRotate->toList(), function ($a, $b) {
-            return strcmp($a->filename, $b->filename);
+        $diff = array_udiff($initialFiles->toList(), $filesAfterRotate->toList(), function ($first, $second) {
+            return strcmp($first->filename, $second->filename);
         });
 
         //Again, only 1 backup was deleted
@@ -167,17 +167,17 @@ public function testSend()
     {
         $file = $this->createBackup();
         $mimetype = mime_content_type($file);
-        $to = 'recipient@example.com';
+        $recipient = 'recipient@example.com';
 
         $instance = new BackupManager();
-        $this->_email = $this->invokeMethod($instance, 'getEmailInstance', [$file, $to]);
+        $this->_email = $this->invokeMethod($instance, 'getEmailInstance', [$file, $recipient]);
         $this->assertInstanceof(Email::class, $this->_email);
 
         $this->assertEmailFrom(Configure::read('DatabaseBackup.mailSender'));
-        $this->assertEmailTo($to);
+        $this->assertEmailTo($recipient);
         $this->assertEmailSubject('Database backup ' . basename($file) . ' from localhost');
         $this->assertEmailAttachmentsContains(basename($file), compact('file', 'mimetype'));
-        $this->assertArrayKeysEqual(['headers', 'message'], $this->BackupManager->send($file, $to));
+        $this->assertArrayKeysEqual(['headers', 'message'], $this->BackupManager->send($file, $recipient));
 
         //With an invalid sender
         @unlink($file);

tests/test_app/TestApp/Application.php

@@ -40,9 +40,7 @@ public function bootstrap()
      */
     public function middleware($middlewareQueue)
     {
-        $middlewareQueue->add(new RoutingMiddleware($this));
-
-        return $middlewareQueue;
+        return $middlewareQueue->add(new RoutingMiddleware($this));
     }
 
     /**