oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-08 08:14:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use DICE for Console

Browse source 
- Use Friendica\Core\Console as Controller for DI-library
- Refactor every console command to use DICE (when possible)
- Adjusting tests
This commit is contained in:
Philipp Holzer 2019-07-28 22:06:33 +02:00
parent b8a336cc0d
commit a60eb9e33d
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
20 changed files with 400 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Console/ServerBlock.php
View file

@ -5,7 +5,6 @@ namespace Friendica\Console;
use Asika\SimpleConsole\CommandArgsException;
use Asika\SimpleConsole\Console;
use Console_Table;
use Friendica\BaseObject;
use Friendica\Core\Config\Configuration;
/**
@ -20,6 +19,11 @@ class ServerBlock extends Console
protected $helpOptions = ['h', 'help', '?'];
/**
* @var Configuration
*/
private $config;
protected function getHelp()
{
$help = <<<HELP
@ -45,20 +49,25 @@ HELP;
return $help;
}
public function __construct(Configuration $config, $argv = null)
{
parent::__construct($argv);
$this->config = $config;
}
protected function doExecute()
{
$a = BaseObject::getApp();
if (count($this->args) == 0) {
$this->printBlockedServers($a->getConfig());
$this->printBlockedServers($this->config);
return 0;
}
switch ($this->getArgument(0)) {
case 'add':
return $this->addBlockedServer($a->getConfig());
return $this->addBlockedServer($this->config);
case 'remove':
return $this->removeBlockedServer($a->getConfig());
return $this->removeBlockedServer($this->config);
default:
throw new CommandArgsException('Unknown command.');
break;
@ -74,7 +83,7 @@ HELP;
{
$table = new Console_Table();
$table->setHeaders(['Domain', 'Reason']);
$blocklist = $config->get('system', 'blocklist');
$blocklist = $config->get('system', 'blocklist', []);
foreach ($blocklist as $domain) {
$table->addRow($domain);
}
@ -99,7 +108,7 @@ HELP;
$update = false;
$currBlocklist = $config->get('system', 'blocklist');
$currBlocklist = $config->get('system', 'blocklist', []);
$newBlockList = [];
foreach ($currBlocklist as $blocked) {
if ($blocked['domain'] === $domain) {
@ -150,7 +159,7 @@ HELP;
$found = false;
$currBlocklist = $config->get('system', 'blocklist');
$currBlocklist = $config->get('system', 'blocklist', []);
$newBlockList = [];
foreach ($currBlocklist as $blocked) {
if ($blocked['domain'] === $domain) {