From 3546d0aabe9ee7db4ecdeddfb18138fbff5d5c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Sat, 16 Jul 2022 07:25:46 +0200 Subject: [PATCH 1/4] This class has already been "imported". --- tests/src/Core/Config/Cache/ConfigFileLoaderTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php b/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php index b956e558ef..43decf1057 100644 --- a/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php +++ b/tests/src/Core/Config/Cache/ConfigFileLoaderTest.php @@ -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 From ce7af4edb85db92b1440c77e247a7e5c34049496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Sat, 16 Jul 2022 07:43:29 +0200 Subject: [PATCH 2/4] All these methods need to return an integer (0=Success) or otherwise doExecute() will return NULL. --- src/Console/ServerBlock.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Console/ServerBlock.php b/src/Console/ServerBlock.php index 38ae35d105..c25b57ae79 100644 --- a/src/Console/ServerBlock.php +++ b/src/Console/ServerBlock.php @@ -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; } /** From cb7f52cc6a3b21476ed7fa44af34e46486d28038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Sat, 16 Jul 2022 12:18:08 +0200 Subject: [PATCH 3/4] Fixed: - $item is the proper array here, - see https://github.com/friendica/friendica/issues/11632#issuecomment-1186119430 --- src/Protocol/OStatus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 36dbb06c84..1efbb0bf39 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -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']); } } } From 3f7c98fd37e46b98ea7155f5d604eb9ce69cf285 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 17 Jul 2022 02:26:46 +0200 Subject: [PATCH 4/4] Fix CI / CD woodpecker pipeline - Combination of `labels` and `matrix`-build is broken --- .woodpecker/.continuous-deployment.yml | 9 ++------- .woodpecker/.releaser.yml | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml index 5a29fe6129..a486228c7e 100644 --- a/.woodpecker/.continuous-deployment.yml +++ b/.woodpecker/.continuous-deployment.yml @@ -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 diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml index 5b56a6e1db..d254b81997 100644 --- a/.woodpecker/.releaser.yml +++ b/.woodpecker/.releaser.yml @@ -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