Merge pull request #324 from hype09

Fix debug-flag in configuration files (#323)

Author: sebastianfeldmann

phpbu.xsd

@@ -122,6 +122,7 @@
     <xs:attribute name="bootstrap" type="xs:anyURI"/>
     <xs:attribute name="verbose" type="xs:boolean" default="false"/>
     <xs:attribute name="colors" type="xs:boolean" default="false"/>
+    <xs:attribute name="debug" type="xs:boolean" default="false"/>
   </xs:attributeGroup>
 
   <xs:group name="configGroup">

src/Configuration/Loader/Json.php

@@ -121,6 +121,9 @@ public function setAppSettings(Configuration $configuration)
         if (isset($this->json['colors'])) {
             $configuration->setColors($this->json['colors']);
         }
+        if (isset($this->json['debug'])) {
+            $configuration->setDebug($this->json['debug']);
+        }
     }
 
     /**

src/Configuration/Loader/Xml.php

@@ -139,6 +139,9 @@ public function setAppSettings(Configuration $configuration)
         if ($root->hasAttribute('colors')) {
             $configuration->setColors(Str::toBoolean($root->getAttribute('colors'), false));
         }
+        if ($root->hasAttribute('debug')) {
+            $configuration->setDebug(Str::toBoolean($root->getAttribute('debug'), false));
+        }
     }
 
     /**

tests/_files/conf/json/config-with-debug.json

@@ -0,0 +1,19 @@
+{
+  "debug": true,
+  "backups": [
+    {
+      "name": "tarball",
+      "source": {
+        "type": "tar",
+        "options": {
+          "path": "src"
+        }
+      },
+      "target": {
+        "dirname": "backup/src",
+        "filename": "tarball-%Y%m%d-%H%i.tar",
+        "compress": "bzip2"
+      }
+    }
+  ]
+}

tests/_files/conf/xml/config-with-debug.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpbu bootstrap="backup/bootstrap.php" debug="true">
+    <backups>
+        <backup name="tarball">
+            <source type="tar">
+                <option name="path" value="src"/>
+            </source>
+            <target dirname="backup/src" filename="tarball-%Y%m%d-%H%i.tar" compress="bzip2"/>
+        </backup>
+    </backups>
+</phpbu>

tests/phpbu/Configuration/Loader/JsonTest.php

@@ -139,6 +139,13 @@ public function testFileNoSyncType()
         $config = $loader->getConfiguration(self::$factory);
     }
 
+    public function testWithDebug(): void
+    {
+        $loader = new Json(PHPBU_TEST_FILES . '/conf/json/config-with-debug.json', $this->getBootstrapperMock(true));
+        $config = $loader->getConfiguration(self::$factory);
+        $this->assertTrue($config->getDebug());
+    }
+
     /**
      * Tests Json::getConfiguration
      */
@@ -152,6 +159,7 @@ public function testAppSettings()
         $this->assertEquals($dir . '/backup/bootstrap.php', $config->getBootstrap());
         $this->assertTrue($config->getColors());
         $this->assertFalse($config->getVerbose());
+        $this->assertFalse($config->getDebug());
     }
 
     /**

tests/phpbu/Configuration/Loader/XmlTest.php

@@ -146,6 +146,15 @@ public function testCustomAdapter()
         $this->assertEquals('demo', $source->options['password']);
     }
 
+    public function testWithDebug(): void
+    {
+        $loader = new Xml(PHPBU_TEST_FILES . '/conf/xml/config-with-debug.xml', $this->getBootstrapperMock(true));
+        $config = $loader->getConfiguration(self::$factory);
+
+        $this->assertFalse($loader->hasValidationErrors());
+        $this->assertTrue($config->getDebug());
+    }
+
     /**
      * Tests Xml::getConfiguration
      */
@@ -161,6 +170,7 @@ public function testAppSettings()
         $this->assertEquals($dir . '/backup/bootstrap.php', $config->getBootstrap());
         $this->assertTrue($config->getColors());
         $this->assertFalse($config->getVerbose());
+        $this->assertFalse($config->getDebug());
     }
 
     /**