Merge pull request #1 from coderatio/laravel6-support

Added support for laravel 6

Author: coderatio

.gitignore

@@ -1,2 +1,3 @@
 /vendor
-composer.lock
+composer.lock
+.DS_Store

.idea/workspace.xml

@@ -17,9 +17,9 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.6"
+        "php": "^5.6|^7.0|^7.1|^7.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "7"
+        "phpunit/phpunit": ">=7"
     }
 }

composer.json

@@ -4,8 +4,4 @@
 
 use Coderatio\SimpleBackup\SimpleBackup;
 
-SimpleBackup::setDatabase(['test_import_db', 'root', ''])
-    ->then()->importFrom('backups/my_db.sql')
-    ->then(function ($simpleBackup) {
-        echo var_dump($simpleBackup->getResponse());
-    });
+SimpleBackup::setDatabase(['test_papay', 'root', 'root'])->downloadAfterExport();

demo.php

@@ -8,7 +8,7 @@ final class Configurator
         'db_host' => 'localhost',
         'db_name' => '',
         'db_user' => '',
-        'insert_chunk' => 100,
+        'insert_chunk' => 200,
         'db_password' => ''
     ];
 
@@ -47,7 +47,7 @@ public static function insertDumpHeader($connection, $config)
         $generation_time = date('M d, Y ') . 'at ' . date('h:s A');
         $copyright =  'Coderatio';
 
-        $contents = "-- Simple Backup SQL Dump\r\n-- Version 1.0\r\n-- https://www.github.com/coderatio/simple-backup/\r\n--\r\n-- Host: localhost:3306\r\n-- Generation Time: {$generation_time}\r\n-- MYSQL Server Version: {$mysql_version}\r\n-- PHP Version: {$php_version}\r\n-- Developer: Josiah O. Yahaya\r\n-- Copyright: {$copyright}";
+        $contents = "-- Simple Backup SQL Dump\r\n-- Version 1.0.3\r\n-- https://www.github.com/coderatio/simple-backup/\r\n--\r\n-- Host: localhost:3306\r\n-- Generation Time: {$generation_time}\r\n-- MYSQL Server Version: {$mysql_version}\r\n-- PHP Version: {$php_version}\r\n-- Developer: Josiah O. Yahaya\r\n-- Copyright: {$copyright}";
 
         $contents .= "\r\n\r\nSET SQL_MODE = \"NO_AUTO_VALUE_ON_ZERO\";\r\nSET AUTOCOMMIT = 0;\r\nSTART TRANSACTION;\r\nSET time_zone = \"+00:00\"\r\n\r\n--\r\n-- Database: `" . $config['db_name'] . "`\r\n-- Total Tables: {$config['total_tables']}\r\n--\r\n\r\n";
 
@@ -56,10 +56,6 @@ public static function insertDumpHeader($connection, $config)
 
     protected function isAssociativeArray($config)
     {
-        if (array_keys($config) !== range(0, count($config) - 1)) {
-            return true;
-        }
-
-        return false;
+        return array_keys($config) !== range(0, count($config) - 1);
     }
 }

src/Foundation/Configurator.php

@@ -22,7 +22,7 @@ public static function prepare($config = [])
         );
 
         if ($self->connection->connect_error) {
-            throw new RuntimeException('Failed to connect to database: ' . $self->connection->connect_error);
+            throw new \RuntimeException('Failed to connect to database: ' . $self->connection->connect_error);
         }
 
         return $self->connection;

src/Foundation/Database.php

@@ -12,14 +12,20 @@ public static function init($config)
         $config['include_tables'] = isset($config['include_tables']) ? $config['include_tables'] : [];
         $config['exclude_tables'] = isset($config['exclude_tables']) ? $config['exclude_tables'] : [];
 
-        return new self(
-            "mysql:host={$config['db_host']};dbname={$config['db_name']}",
-            "{$config['db_user']}",
-            "{$config['db_password']}",
-            [
-                'include-tables' => $config['include_tables'],
-                'exclude-tables' => $config['exclude_tables']
-            ]
-        );
+        try {
+            return new self(
+                "mysql:host={$config['db_host']};dbname={$config['db_name']}",
+                (string)($config['db_user']),
+                (string)($config['db_password']),
+                [
+                    'include-tables' => $config['include_tables'],
+                    'exclude-tables' => $config['exclude_tables']
+                ]
+            );
+        }
+
+        catch (\Exception $e) {
+            throw new \RuntimeException($e->getMessage());
+        }
     }
 }

src/Foundation/Provider.php

@@ -2,6 +2,7 @@
 
 namespace Coderatio\SimpleBackup;
 
+use Closure;
 use RuntimeException;
 use Coderatio\SimpleBackup\Foundation\Database;
 use Coderatio\SimpleBackup\Foundation\Provider;
@@ -229,7 +230,7 @@ public function importFrom($sql_file_OR_content, $config = [])
         set_time_limit(3000);
 
         $error_message = '';
-        $error_status = true;
+        $error_status = false;
 
         try {
             if (!empty($config)) {
@@ -279,7 +280,7 @@ public function importFrom($sql_file_OR_content, $config = [])
                 }
             }
         } catch (\Exception $e) {
-            $error_status = false;
+            $error_status = true;
 
             $this->response = [
                 'status' => false,
@@ -289,7 +290,7 @@ public function importFrom($sql_file_OR_content, $config = [])
 
         $this->response['message'] = $error_message;
 
-        if ($error_status === true) {
+        if ($error_status === false) {
             $this->response['message'] = 'Importing finished successfully';
         }
 
@@ -354,7 +355,7 @@ public function storeAfterExportTo($path_to_store, $name = null)
 
         $this->export_name = $export_name;
 
-        if (!file_exists($path_to_store) && !mkdir($path_to_store)) {
+        if (!file_exists($path_to_store) && !mkdir($path_to_store) && !is_dir($path_to_store)) {
             throw new RuntimeException(sprintf('Directory "%s" was not created', $path_to_store));
         }
 
@@ -386,12 +387,12 @@ public function getExportedName()
      * This is used to chain more methods.
      * You can pass in a function to modify any other thing.
      *
-     * @param null $callback
+     * @param Closure $callback
      * @return $this
      */
-    public function then($callback = null)
+    public function then(Closure $callback = null)
     {
-        if ($callback !== null && is_callable($callback)) {
+        if ($callback !== null) {
             $callback($this);
         }
 
@@ -426,26 +427,29 @@ public function setTableLimitsOn($tables = [])
         return $this;
     }
 
-     /**
-     *  Include only the tables mentioned in @var $tables
-     *
-     * @param array $tables
+    /**
+     *  Include only the tables mentioned in @param array $tables
      * @return $this
+     * @throws NoTablesFoundException
+     * @var $tables
+     *
      */
     public function includeOnly($tables = [])
     {
         $this->include_only_some_tables = true;
 
-        $this->tables_to_include = array_filter($tables, function($table) {
-            if(in_array($table, $this->getTargetTables())) {
+        $this->tables_to_include = array_filter($tables, static function($table) {
+            if(in_array($table, $this->getTargetTables(), false)) {
                 return $table;
             }
+
+            return null;
         });
 
         $this->tables = $this->tables_to_include;
 
         if(empty($this->tables_to_include)) {
-            throw new NoTablesFoundException("No tables found to export.");
+            throw new NoTablesFoundException('No tables found to export.');
         }
 
         $this->config['include_tables'] = $this->tables_to_include;
@@ -455,30 +459,34 @@ public function includeOnly($tables = [])
     }
 
     /**
-     *  Exclude only the tables mentioned in @var $tables
-     *
-     * @param array $tables
+     *  Exclude only the tables mentioned in @param array $tables
      * @return $this
+     * @throws NoTablesFoundException
+     * @var $tables
+     *
      */
     public function excludeOnly($tables = [])
     {
         $this->exclude_only_some_tables = true;
 
-        $this->tables_to_exclude = array_filter($this->getTargetTables(), function($table) use ($tables) {
-            if(in_array($table, $tables)) {
+        $this->tables_to_exclude = array_filter($this->getTargetTables(), static function($table) use ($tables) {
+            if(in_array($table, $tables, false)) {
                 return $table;
             }
+
+            return null;
         });
 
-        $this->tables = array_filter($this->tables, function($table){
-            if(!in_array($table, $this->tables_to_exclude)) {
+        $this->tables = array_filter($this->tables, static function($table){
+            if(!in_array($table, $this->tables_to_exclude, false)) {
                 return $table;
             }
 
+            return null;
         });
 
         if(empty($this->tables)) {
-            throw new NoTablesFoundException("No tables found to export.");
+            throw new NoTablesFoundException('No tables found to export.');
         }
 
         $this->config['exclude_tables'] = $this->tables_to_exclude;