keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11739 from Quix0r/fixes/missing-return-statements

Browse source 
Fixes/missing return statements
This commit is contained in:
Philipp 2022-07-16 16:23:32 +02:00 committed by GitHub
commit 1894302011
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Console/ServerBlock.php
View file

@ -118,6 +118,9 @@ HELP;
foreach ($blocklist as $domain) { foreach ($blocklist as $domain) {
fputcsv($fp, $domain); fputcsv($fp, $domain);
} }
// Success
return 0;
} }
/** /**
* Imports a list of domains and a reason for the block from a CSV * Imports a list of domains and a reason for the block from a CSV
@ -130,6 +133,7 @@ HELP;
$filename = $this->getArgument(1); $filename = $this->getArgument(1);
$currBlockList = $config->get('system', 'blocklist', []); $currBlockList = $config->get('system', 'blocklist', []);
$newBlockList = []; $newBlockList = [];
if (($fp = fopen($filename, 'r')) !== false) { if (($fp = fopen($filename, 'r')) !== false) {
while (($data = fgetcsv($fp, 1000, ',')) !== false) { while (($data = fgetcsv($fp, 1000, ',')) !== false) {
$domain = $data[0]; $domain = $data[0];
@ -146,11 +150,13 @@ HELP;
$newBlockList[] = $data; $newBlockList[] = $data;
} }
} }
foreach ($currBlockList as $blocked) { foreach ($currBlockList as $blocked) {
if (!in_array($blocked, $newBlockList)) { if (!in_array($blocked, $newBlockList)) {
$newBlockList[] = $blocked; $newBlockList[] = $blocked;
} }
} }
if ($config->set('system', 'blocklist', $newBlockList)) { if ($config->set('system', 'blocklist', $newBlockList)) {
$this->out(sprintf("Entries from %s that were not blocked before are now blocked", $filename)); $this->out(sprintf("Entries from %s that were not blocked before are now blocked", $filename));
return 0; return 0;
@ -158,7 +164,6 @@ HELP;
$this->out(sprintf("Couldn't save '%s' as blocked server", $domain)); $this->out(sprintf("Couldn't save '%s' as blocked server", $domain));
return 1; return 1;
} }
} else { } else {
throw new Exception(sprintf('The file "%s" could not be opened for importing', $filename)); throw new Exception(sprintf('The file "%s" could not be opened for importing', $filename));
} }
@ -178,6 +183,9 @@ HELP;
$table->addRow($domain); $table->addRow($domain);
} }
$this->out($table->getTable()); $this->out($table->getTable());
// Success
return 0;
} }
/** /**

10
tests/src/Core/Config/Cache/ConfigFileLoaderTest.php
View file

@ -174,7 +174,7 @@ class ConfigFileLoaderTest extends MockedTest
->at($this->root) ->at($this->root)
->setContent(file_get_contents($file)); ->setContent(file_get_contents($file));
$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader( $configFileLoader = new ConfigFileLoader(
$this->root->url(), $this->root->url(),
$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR, $this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR $this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
@ -228,7 +228,7 @@ class ConfigFileLoaderTest extends MockedTest
->at($this->root->getChild('addon')->getChild('test')->getChild('config')) ->at($this->root->getChild('addon')->getChild('test')->getChild('config'))
->setContent(file_get_contents($file)); ->setContent(file_get_contents($file));
$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader( $configFileLoader = new ConfigFileLoader(
$this->root->url(), $this->root->url(),
$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR, $this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR $this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
@ -265,7 +265,7 @@ class ConfigFileLoaderTest extends MockedTest
->at($this->root->getChild('config')) ->at($this->root->getChild('config'))
->setContent(file_get_contents($fileDir . 'B.config.php')); ->setContent(file_get_contents($fileDir . 'B.config.php'));
$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader( $configFileLoader = new ConfigFileLoader(
$this->root->url(), $this->root->url(),
$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR, $this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR $this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
@ -299,7 +299,7 @@ class ConfigFileLoaderTest extends MockedTest
->at($this->root->getChild('config')) ->at($this->root->getChild('config'))
->setContent(file_get_contents($fileDir . 'B.ini.php')); ->setContent(file_get_contents($fileDir . 'B.ini.php'));
$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader( $configFileLoader = new ConfigFileLoader(
$this->root->url(), $this->root->url(),
$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR, $this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR $this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
@ -333,7 +333,7 @@ class ConfigFileLoaderTest extends MockedTest
->at($this->root->getChild('config')) ->at($this->root->getChild('config'))
->setContent(file_get_contents($fileDir . 'B.ini.php')); ->setContent(file_get_contents($fileDir . 'B.ini.php'));
$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader( $configFileLoader = new ConfigFileLoader(
$this->root->url(), $this->root->url(),
$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR, $this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR $this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR