Merge branch 'main' of into 6.0

Author: sebastianfeldmann

src/Backup/Source/Mysqldump.php

@@ -200,6 +200,13 @@ class Mysqldump extends SimulatorExecutable implements Simulator, Restorable
      */
     private $routines;
 
+    /**
+     * Dump scheduled events
+     *
+     * @var bool
+     */
+    private $events;
+
     /**
      * Skip triggers
      * --skip-triggers
@@ -238,6 +245,7 @@ public function setup(array $conf = [])
         $this->noData             = Util\Str::toBoolean(Util\Arr::getValue($conf, 'noData', ''), false);
         $this->filePerTable       = Util\Str::toBoolean(Util\Arr::getValue($conf, 'filePerTable', ''), false);
         $this->routines           = Util\Str::toBoolean(Util\Arr::getValue($conf, 'routines', ''), false);
+        $this->events             = Util\Str::toBoolean(Util\Arr::getValue($conf, 'events', ''), false);
         $this->skipTriggers       = Util\Str::toBoolean(Util\Arr::getValue($conf, 'skipTriggers', ''), false);
 
         // this doesn't fail, but it doesn't work, so throw an exception so the user understands
@@ -369,6 +377,7 @@ protected function createExecutable(Target $target) : Executable
                    ->produceFilePerTable($this->filePerTable)
                    ->dumpNoData($this->noData)
                    ->dumpRoutines($this->routines)
+                   ->dumpEvents($this->events)
                    ->skipTriggers($this->skipTriggers)
                    ->dumpStructureOnly($this->structureOnly)
                    ->dumpTo($this->getDumpTarget($target));

src/Cli/Executable/Mysqldump.php

@@ -180,6 +180,14 @@ class Mysqldump extends Abstraction implements Executable
      */
     private $routines = false;
 
+    /**
+     * Dump scheduled events.
+     * --events
+     *
+     * @var bool
+     */
+    private $events = false;
+
     /**
      * Skip triggers
      * --skip-triggers
@@ -443,6 +451,18 @@ public function dumpRoutines(bool $bool) : Mysqldump
         return $this;
     }
 
+    /**
+     * Dump scheduled events
+     *
+     * @param  bool $bool
+     * @return \phpbu\App\Cli\Executable\Mysqldump
+     */
+    public function dumpEvents(bool $bool) : Mysqldump
+    {
+        $this->events = $bool;
+        return $this;
+    }
+
     /**
      * Skip triggers
      *
@@ -505,6 +525,7 @@ protected function createCommandLine() : CommandLine
         $cmd->addOptionIfNotEmpty('--set-gtid-purged', $this->gtidPurged);
         $cmd->addOptionIfNotEmpty('--ssl-ca', $this->sslCa);
         $cmd->addOptionIfNotEmpty('--routines', $this->routines, false);
+        $cmd->addOptionIfNotEmpty('--events', $this->events, false);
         $cmd->addOptionIfNotEmpty('--skip-triggers', $this->skipTriggers, false);
 
         $this->configureSourceData($cmd);

tests/phpbu/Adapter/WordpressTest.php tests/phpbu/Adapter/WordPressTest.phptests/phpbu/Adapter/WordpressTest.php renamed to tests/phpbu/Adapter/WordPressTest.php

@@ -14,14 +14,14 @@
  * @link       http://www.phpbu.de/
  * @since      Class available since Release 6.0.12
  */
-class WordpressTest extends TestCase
+class WordPressTest extends TestCase
 {
     /**
      * Tests Wordpress::setup
      */
     public function testSetup()
     {
-        $arr = new Wordpress();
+        $arr = new WordPress();
         $arr->setup(['file' => PHPBU_TEST_FILES . '/misc/wp-config.php']);
 
         $this->assertTrue(true);
@@ -33,7 +33,7 @@ public function testSetup()
     public function testSetupFail()
     {
         $this->expectException('phpbu\App\Exception');
-        $arr = new Wordpress();
+        $arr = new WordPress();
         $arr->setup(['file' => 'wp-config.php']);
     }
 
@@ -42,7 +42,7 @@ public function testSetupFail()
      */
     public function testGetValue()
     {
-        $arr = new Wordpress();
+        $arr = new WordPress();
         $arr->setup(['file' => PHPBU_TEST_FILES . '/misc/wp-config.php']);
 
         $dbName = $arr->getValue('DB_NAME');
@@ -57,7 +57,7 @@ public function testGetValue()
     public function testGetValueFail()
     {
         $this->expectException('phpbu\App\Exception');
-        $arr = new Wordpress();
+        $arr = new WordPress();
         $arr->setup(['file' => PHPBU_TEST_FILES . '/misc/wp-config.php']);
 
         $arr->getValue('DB_FAIL');

tests/phpbu/Backup/Source/InfluxdumpTest.php

@@ -1,6 +1,7 @@
 <?php
 namespace phpbu\App\Backup\Source;
 
+use Exception;
 use phpbu\App\Backup\CliMockery;
 use phpbu\App\BaseMockery;
 use PHPUnit\Framework\TestCase;
@@ -113,8 +114,8 @@ public function testBackupFail()
 
         try {
             $influxd->backup($target, $appResult);
-        } catch (\Exception $e) {
-            $this->assertFileNotExists($file);
+        } catch (Exception $e) {
+            $this->assertFileDoesNotExist($file);
             throw $e;
         }
     }

tests/phpbu/Backup/Source/LdapdumpTest.php

@@ -1,6 +1,7 @@
 <?php
 namespace phpbu\App\Backup\Source;
 
+use Exception;
 use phpbu\App\Backup\CliMockery;
 use phpbu\App\BaseMockery;
 use PHPUnit\Framework\TestCase;
@@ -198,8 +199,8 @@ public function testBackupFail()
 
         try {
             $ldap->backup($target, $appResult);
-        } catch (\Exception $e) {
-            $this->assertFileNotExists($file);
+        } catch (Exception $e) {
+            $this->assertFileDoesNotExist($file);
             throw $e;
         }
     }

tests/phpbu/Backup/Source/MysqldumpTest.php

@@ -209,6 +209,20 @@ public function testSkipTriggers()
         $this->assertEquals(PHPBU_TEST_BIN . '/mysqldump --skip-triggers --all-databases', $executable->getCommand());
     }
 
+    /**
+     * Tests Mysqldump::
+     */
+    public function testEvents()
+    {
+        $target    = $this->createTargetMock();
+        $mysqldump = new Mysqldump();
+        $mysqldump->setup(['pathToMysqldump' => PHPBU_TEST_BIN, 'events' => 'true']);
+
+        $executable = $mysqldump->getExecutable($target);
+
+        $this->assertEquals(PHPBU_TEST_BIN . '/mysqldump --events --all-databases', $executable->getCommand());
+    }
+
     /**
      * Tests Mysqldump::backup
      */
@@ -324,7 +338,7 @@ public function testBackupFail()
         try {
             $mysqldump->backup($target, $appResult);
         } catch (Exception $e) {
-            $this->assertFileNotExists($file);
+            $this->assertFileDoesNotExist($file);
             throw $e;
         }
     }

tests/phpbu/Cli/Executable/MysqldumpTest.php

@@ -226,6 +226,18 @@ public function testNoData()
         $this->assertEquals($path . '/mysqldump --all-databases --no-data', $mysqldump->getCommand());
     }
 
+    /**
+     * Tests Mysqldump::dumpEvents
+     */
+    public function testEvents()
+    {
+        $path      = realpath(__DIR__ . '/../../../_files/bin');
+        $mysqldump = new Mysqldump($path);
+        $mysqldump->dumpEvents(true);
+
+        $this->assertEquals($path . '/mysqldump --events --all-databases', $mysqldump->getCommand());
+    }
+
     /**
      * Tests Mysqldump::getCommand
      */

tests/phpbu/Util/CliTest.php

@@ -181,10 +181,10 @@ public function testRemoveDir()
 
         Cli::removeDir($dirToDelete);
 
-        $this->assertFileNotExists($file);
-        $this->assertFileNotExists($fileInSub);
-        $this->assertFileNotExists($subDir);
-        $this->assertFileNotExists($dirToDelete);
+        $this->assertFileDoesNotExist($file);
+        $this->assertFileDoesNotExist($fileInSub);
+        $this->assertFileDoesNotExist($subDir);
+        $this->assertFileDoesNotExist($dirToDelete);
     }
 
     /**