clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11840 from Quix0r/fixes/new-array-way 

Reformatting and using [] instead of discouraged array()
This commit is contained in:
Hypolite Petovan 2022-08-10 11:40:11 -04:00 committed by GitHub
parent 809beeee9d ae9bd4f3f2
commit ec17216ded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Console/Extract.php
View File

@ -21,6 +21,9 @@
namespace Friendica\Console; namespace Friendica\Console;
use \RecursiveDirectoryIterator;
use \RecursiveIteratorIterator;
/** /**
* Extracts translation strings from the Friendica project's files to be exported * Extracts translation strings from the Friendica project's files to be exported
* to Transifex for translation. * to Transifex for translation.
@ -120,10 +123,10 @@ HELP;
$arr[] = $matchtkns[0]; $arr[] = $matchtkns[0];
$s .= '$a->strings[' . $matchtkns[0] . "] = array(\n"; $s .= '$a->strings[' . $matchtkns[0] . "] = [\n";
$s .= "\t0 => " . $matchtkns[0] . ",\n"; $s .= "\t0 => " . $matchtkns[0] . ",\n";
$s .= "\t1 => " . $matchtkns[1] . ",\n"; $s .= "\t1 => " . $matchtkns[1] . ",\n";
$s .= ");\n"; $s .= "];\n";
} }
} }
} }
@ -141,9 +144,17 @@ HELP;
return 0; return 0;
} }
private function globRecursive($path) { /**
$dir_iterator = new \RecursiveDirectoryIterator($path); * Returns an array with found files and directories including their paths.
$iterator = new \RecursiveIteratorIterator($dir_iterator, \RecursiveIteratorIterator::SELF_FIRST); *
* @param string $path Base path to scan
*
* @return array A flat array with found files and directories
*/
private function globRecursive(string $path): array
{
$dir_iterator = new RecursiveDirectoryIterator($path);
$iterator = new RecursiveIteratorIterator($dir_iterator, RecursiveIteratorIterator::SELF_FIRST);
$return = []; $return = [];
foreach ($iterator as $file) { foreach ($iterator as $file) {

4
src/Content/Widget.php
View File

@ -268,7 +268,7 @@ class Widget
$r = DBA::select('contact', ['network'], $condition, ['group_by' => ['network'], 'order' => ['network']]); $r = DBA::select('contact', ['network'], $condition, ['group_by' => ['network'], 'order' => ['network']]);
$nets = array(); $nets = [];
while ($rr = DBA::fetch($r)) { while ($rr = DBA::fetch($r)) {
$nets[] = ['ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network'])]; $nets[] = ['ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network'])];
} }
@ -334,7 +334,7 @@ class Widget
return ''; return '';
} }
$terms = array(); $terms = [];
foreach (Post\Category::getArray($uid, Post\Category::CATEGORY) as $savedFolderName) { foreach (Post\Category::getArray($uid, Post\Category::CATEGORY) as $savedFolderName) {
$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName]; $terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
} }

2
src/Network/Probe.php
View File

@ -1738,7 +1738,7 @@ class Probe
// Resolve arbitrary relative path // Resolve arbitrary relative path
// Lifted from https://www.php.net/manual/en/function.realpath.php#84012 // Lifted from https://www.php.net/manual/en/function.realpath.php#84012
$parts = array_filter(explode('/', $path), 'strlen'); $parts = array_filter(explode('/', $path), 'strlen');
$absolutes = array(); $absolutes = [];
foreach ($parts as $part) { foreach ($parts as $part) {
if ('.' == $part) continue; if ('.' == $part) continue;
if ('..' == $part) { if ('..' == $part) {