X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FUtil%2FVFSTrait.php;h=96f385b3bad3813bb2a5f29bc56483e50611b45b;hb=aa0b485f3dca72c5448076e913fa54d948cd7731;hp=50999b984d1f3ddae4dbd2e9552661c3fc5d2024;hpb=98d90e131ded624c552102dd450a21e6a67aecf1;p=friendica.git

diff --git a/tests/Util/VFSTrait.php b/tests/Util/VFSTrait.php
index 50999b984d..96f385b3ba 100644
--- a/tests/Util/VFSTrait.php
+++ b/tests/Util/VFSTrait.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Test\Util;
 
@@ -21,33 +40,36 @@ trait VFSTrait
 		$structure = [
 			'config' => [],
 			'bin' => [],
-			'test' => []
+			'static' => [],
+			'test' => [],
+			'logs' => [],
 		];
 
 		// create a virtual directory and copy all needed files and folders to it
-		$this->root = vfsStream::setup('friendica', null, $structure);
+		$this->root = vfsStream::setup('friendica', 0777, $structure);
 
-		$this->setConfigFile('defaults.config.php');
-		$this->setConfigFile('settings.config.php');
+		$this->setConfigFile('dbstructure.config.php', true);
+		$this->setConfigFile('defaults.config.php', true);
+		$this->setConfigFile('settings.config.php', true);
 		$this->setConfigFile('local.config.php');
-		$this->setConfigFile('dbstructure.config.php');
 	}
 
 	/**
 	 * Copying a config file from the file system to the Virtual File System
 	 *
 	 * @param string $filename The filename of the config file
+	 * @param bool $static True, if the folder `static` instead of `config` should be used
 	 */
-	protected function setConfigFile($filename)
+	protected function setConfigFile($filename, bool $static = false)
 	{
 		$file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
 			'..' . DIRECTORY_SEPARATOR .
-			'config' . DIRECTORY_SEPARATOR .
+			($static ? 'static' : 'config') . DIRECTORY_SEPARATOR .
 			$filename;
 
 		if (file_exists($file)) {
 			vfsStream::newFile($filename)
-				->at($this->root->getChild('config'))
+				->at($this->root->getChild(($static ? 'static' : 'config')))
 				->setContent(file_get_contents($file));
 		}
 	}
@@ -56,11 +78,12 @@ trait VFSTrait
 	 * Delets a config file from the Virtual File System
 	 *
 	 * @param string $filename The filename of the config file
+	 * @param bool $static True, if the folder `static` instead of `config` should be used
 	 */
-	protected function delConfigFile($filename)
+	protected function delConfigFile($filename, bool $static = false)
 	{
-		if ($this->root->hasChild('config/' . $filename)) {
-			$this->root->removeChild('config/' . $filename);
+		if ($this->root->hasChild(($static ? 'static' : 'config') . '/' . $filename)) {
+			$this->root->getChild(($static ? 'static' : 'config'))->removeChild($filename);
 		}
 	}
 }