Merge remote-tracking branch 'upstream/develop' into warn
This commit is contained in:
commit
23953be7cb
|
@ -1,8 +1,3 @@
|
|||
matrix:
|
||||
include:
|
||||
- PHP_MAJOR_VERSION: 7.4
|
||||
PHP_VERSION: 7.4.18
|
||||
|
||||
depends_on:
|
||||
- phpunit
|
||||
- code_standards_check
|
||||
|
@ -33,7 +28,7 @@ pipeline:
|
|||
settings:
|
||||
backend: "filesystem"
|
||||
restore: true
|
||||
cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}"
|
||||
cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
|
||||
archive_format: "gzip"
|
||||
mount:
|
||||
- '.composer'
|
||||
|
@ -44,7 +39,7 @@ pipeline:
|
|||
branch: [ develop, '*-rc' ]
|
||||
event: push
|
||||
composer_install:
|
||||
image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
|
||||
image: friendicaci/php7.4:php7.4.18
|
||||
commands:
|
||||
- export COMPOSER_HOME=.composer
|
||||
- composer validate
|
||||
|
|
|
@ -1,8 +1,3 @@
|
|||
matrix:
|
||||
include:
|
||||
- PHP_MAJOR_VERSION: 7.4
|
||||
PHP_VERSION: 7.4.18
|
||||
|
||||
depends_on:
|
||||
- phpunit
|
||||
- code_standards_check
|
||||
|
@ -31,7 +26,7 @@ pipeline:
|
|||
settings:
|
||||
backend: "filesystem"
|
||||
restore: true
|
||||
cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}"
|
||||
cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
|
||||
archive_format: "gzip"
|
||||
mount:
|
||||
- '.composer'
|
||||
|
@ -42,7 +37,7 @@ pipeline:
|
|||
branch: stable
|
||||
event: tag
|
||||
composer_install:
|
||||
image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
|
||||
image: friendicaci/php7.4:php7.4.18
|
||||
commands:
|
||||
- export COMPOSER_HOME=.composer
|
||||
- composer validate
|
||||
|
|
|
@ -118,6 +118,9 @@ HELP;
|
|||
foreach ($blocklist as $domain) {
|
||||
fputcsv($fp, $domain);
|
||||
}
|
||||
|
||||
// Success
|
||||
return 0;
|
||||
}
|
||||
/**
|
||||
* Imports a list of domains and a reason for the block from a CSV
|
||||
|
@ -130,6 +133,7 @@ HELP;
|
|||
$filename = $this->getArgument(1);
|
||||
$currBlockList = $config->get('system', 'blocklist', []);
|
||||
$newBlockList = [];
|
||||
|
||||
if (($fp = fopen($filename, 'r')) !== false) {
|
||||
while (($data = fgetcsv($fp, 1000, ',')) !== false) {
|
||||
$domain = $data[0];
|
||||
|
@ -146,11 +150,13 @@ HELP;
|
|||
$newBlockList[] = $data;
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($currBlockList as $blocked) {
|
||||
if (!in_array($blocked, $newBlockList)) {
|
||||
$newBlockList[] = $blocked;
|
||||
}
|
||||
}
|
||||
|
||||
if ($config->set('system', 'blocklist', $newBlockList)) {
|
||||
$this->out(sprintf("Entries from %s that were not blocked before are now blocked", $filename));
|
||||
return 0;
|
||||
|
@ -158,7 +164,6 @@ HELP;
|
|||
$this->out(sprintf("Couldn't save '%s' as blocked server", $domain));
|
||||
return 1;
|
||||
}
|
||||
|
||||
} else {
|
||||
throw new Exception(sprintf('The file "%s" could not be opened for importing', $filename));
|
||||
}
|
||||
|
@ -178,6 +183,9 @@ HELP;
|
|||
$table->addRow($domain);
|
||||
}
|
||||
$this->out($table->getTable());
|
||||
|
||||
// Success
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1168,7 +1168,7 @@ class OStatus
|
|||
break;
|
||||
|
||||
default:
|
||||
Logger::warning('Unsupported rel=' . $attribute['rel'] . ', href=' . $attribute['href'] . ', object-type=' . $attribute['object-type']);
|
||||
Logger::warning('Unsupported rel=' . $attribute['rel'] . ', href=' . $attribute['href'] . ', object-type=' . $item['object-type']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -174,7 +174,7 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
->at($this->root)
|
||||
->setContent(file_get_contents($file));
|
||||
|
||||
$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader(
|
||||
$configFileLoader = new ConfigFileLoader(
|
||||
$this->root->url(),
|
||||
$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_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'))
|
||||
->setContent(file_get_contents($file));
|
||||
|
||||
$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader(
|
||||
$configFileLoader = new ConfigFileLoader(
|
||||
$this->root->url(),
|
||||
$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
|
||||
$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
|
||||
|
@ -265,7 +265,7 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
->at($this->root->getChild('config'))
|
||||
->setContent(file_get_contents($fileDir . 'B.config.php'));
|
||||
|
||||
$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader(
|
||||
$configFileLoader = new ConfigFileLoader(
|
||||
$this->root->url(),
|
||||
$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
|
||||
$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
|
||||
|
@ -299,7 +299,7 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
->at($this->root->getChild('config'))
|
||||
->setContent(file_get_contents($fileDir . 'B.ini.php'));
|
||||
|
||||
$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader(
|
||||
$configFileLoader = new ConfigFileLoader(
|
||||
$this->root->url(),
|
||||
$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
|
||||
$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
|
||||
|
@ -333,7 +333,7 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
->at($this->root->getChild('config'))
|
||||
->setContent(file_get_contents($fileDir . 'B.ini.php'));
|
||||
|
||||
$configFileLoader = new \Friendica\Core\Config\Util\ConfigFileLoader(
|
||||
$configFileLoader = new ConfigFileLoader(
|
||||
$this->root->url(),
|
||||
$this->root->url() . DIRECTORY_SEPARATOR . Config::CONFIG_DIR,
|
||||
$this->root->url() . DIRECTORY_SEPARATOR . Config::STATIC_DIR
|
||||
|
|
Loading…
Reference in New Issue
Block a user