Merge pull request #6209 from MrPetovan/task/move-config-to-php-array

Remove util/ folder

src/Core/Console/DocBloxErrorChecker.php

@@ -59,7 +59,6 @@ HELP;
 			throw new \RuntimeException('DocBlox isn\'t available.');
 		}
 
-		//return from util folder to frindica base dir
 		$dir = get_app()->getBasePath();
 
 		//stack for dirs to search
@@ -130,8 +129,6 @@ HELP;
 	/**
 	 * This function generates a comma separated list of file names.
 	 *
-	 * @package util
-	 *
 	 * @param array $fileset Set of file names
 	 *
 	 * @return string comma-separated list of the file names
@@ -143,7 +140,6 @@ HELP;
 
 	/**
 	 * This functions runs phpdoc on the provided list of files
-	 * @package util
 	 *
 	 * @param array $fileset Set of filenames
 	 *
@@ -169,8 +165,6 @@ HELP;
 	 *
 	 * In that version, it does not necessarily generate the smallest set, because it may not alter the elements order enough.
 	 *
-	 * @package util
-	 *
 	 * @param array $fileset set of filenames
 	 * @param int $ps number of files in subsets
 	 *

src/Core/Console/PhpToPo.php

@@ -27,7 +27,7 @@ Description
 
 Options
 	-p <n>        Number of plural forms. Default: 2
-	--base <file> Path to base messages.po file. Default: util/messages.po
+	--base <file> Path to base messages.po file. Default: view/lang/C/messages.po
 	-h|--help|-?  Show help information
 	-v            Show more debug information.
 HELP;
@@ -107,7 +107,7 @@ HELP;
 		$out .= sprintf('"Plural-Forms: nplurals=%s; plural=%s;\n"', $lang_pnum, $lang_logic) . "\n";
 		$out .= "\n";
 
-		$base_path = $this->getOption('base', 'util' . DIRECTORY_SEPARATOR . 'messages.po');
+		$base_path = $this->getOption('base', 'view/lang/C/messages.po');
 
 		// load base messages.po and extract msgids
 		$base_msgids = [];

src/Core/Console/PoToPhp.php

@@ -61,7 +61,7 @@ HELP;
 
 		$outfile = dirname($pofile) . DIRECTORY_SEPARATOR . 'strings.php';
 
-		if (strstr($outfile, 'util')) {
+		if (basename(dirname($pofile)) == 'C') {
 			$lang = 'en';
 		} else {
 			$lang = str_replace('-', '_', basename(dirname($pofile)));

src/Core/Console/Typo.php

@@ -86,8 +86,6 @@ HELP;
 			$this->out('String files');
 		}
 
-		$this->checkFile($php_path, 'util/strings.php');
-
 		$files = glob('view/lang/*/strings.php');
 		$this->checkFiles($php_path, $files);