From dc2172c1a80ff81336a46e9bd9181bfb0623c305 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Mon, 19 Aug 2024 18:16:15 +0200 Subject: [PATCH] chore: Adjust REUSE information Signed-off-by: Ferdinand Thiessen --- .gitignore | 3 +++ REUSE.toml | 8 ++++++- tests/bootstrap.php | 5 ++++ .../lib/Compliance/HistoryComplianceTest.php | 23 +++---------------- tests/lib/PasswordPolicyConfigTest.php | 21 +++-------------- tests/lib/PasswordValidatorTest.php | 21 +++-------------- .../CommonPasswordsValidatorTest.php | 23 +++---------------- tests/lib/Validator/LengthValidatorTest.php | 23 +++---------------- .../NumericCharacterValidatorTest.php | 23 +++---------------- .../SpecialCharactersValidatorTest.php | 23 +++---------------- .../UpperCaseLowerCaseValidatorTest.php | 23 +++---------------- tests/phpunit.xml | 4 ++++ 12 files changed, 43 insertions(+), 157 deletions(-) diff --git a/.gitignore b/.gitignore index 0c30fdf0..0490062f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: CC0-1.0 + /vendor/ /.php-cs-fixer.cache diff --git a/REUSE.toml b/REUSE.toml index daf11e8e..90d29278 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -6,11 +6,17 @@ SPDX-PackageSupplier = "Nextcloud " SPDX-PackageDownloadLocation = "https://github.com/nextcloud/external" [[annotations]] -path = [".gitattributes", ".editorconfig", "babel.config.js", ".php-cs-fixer.dist.php", "package-lock.json", "package.json", "composer.json", "composer.lock", "webpack.js", "stylelint.config.js", ".eslintrc.js", ".gitignore", ".jshintrc", ".l10nignore", "action/.gitignore", "action/package.json", "action/package-lock.json", "action/dist/index.js", "tests/**", "psalm.xml", "vendor-bin/**/composer.json", "vendor-bin/**/composer.lock", ".tx/config", "webpack.config.js", "js/vendor.LICENSE.txt", ".github/CODEOWNERS", "vite.config.js", "stylelint.config.cjs", ".eslintrc.json"] +path = ["package-lock.json", "package.json", ".l10nignore", "composer.json", "composer.lock", "vendor-bin/**/composer.json", "vendor-bin/**/composer.lock", ".tx/config", "js/vendor.LICENSE.txt", ".github/CODEOWNERS", ".eslintrc.json"] precedence = "aggregate" SPDX-FileCopyrightText = "none" SPDX-License-Identifier = "CC0-1.0" +[[annotations]] +path = ["screenshots/*.png"] +precedence = "aggregate" +SPDX-FileCopyrightText = "2024 Nextcloud GmbH and Nextcloud contributors" +SPDX-License-Identifier = "CC0-1.0" + [[annotations]] path = ["l10n/**.js", "l10n/**.json", "js/**.mjs.map", "js/**.mjs", "js/templates/**.handlebars", "css/password_policy-settings.css"] precedence = "aggregate" diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 1a488b4f..56b1bb67 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,5 +1,10 @@ - * - * @author Arthur Schiwon - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * +/*! + * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\Password_Policy\Tests\Compliance; diff --git a/tests/lib/PasswordPolicyConfigTest.php b/tests/lib/PasswordPolicyConfigTest.php index 78525b30..5151dd39 100644 --- a/tests/lib/PasswordPolicyConfigTest.php +++ b/tests/lib/PasswordPolicyConfigTest.php @@ -1,22 +1,7 @@ - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * +/*! + * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\Password_Policy\Tests; diff --git a/tests/lib/PasswordValidatorTest.php b/tests/lib/PasswordValidatorTest.php index 397ffd46..bc5614e7 100644 --- a/tests/lib/PasswordValidatorTest.php +++ b/tests/lib/PasswordValidatorTest.php @@ -1,22 +1,7 @@ - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * +/*! + * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\Password_Policy\Tests; diff --git a/tests/lib/Validator/CommonPasswordsValidatorTest.php b/tests/lib/Validator/CommonPasswordsValidatorTest.php index 5378cfe9..7e5c83be 100644 --- a/tests/lib/Validator/CommonPasswordsValidatorTest.php +++ b/tests/lib/Validator/CommonPasswordsValidatorTest.php @@ -1,26 +1,9 @@ - * - * @author Roeland Jago Douma - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * +/*! + * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\Password_Policy\Tests\Validator; diff --git a/tests/lib/Validator/LengthValidatorTest.php b/tests/lib/Validator/LengthValidatorTest.php index 6bacb49c..b346662f 100644 --- a/tests/lib/Validator/LengthValidatorTest.php +++ b/tests/lib/Validator/LengthValidatorTest.php @@ -1,26 +1,9 @@ - * - * @author Roeland Jago Douma - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * +/*! + * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\Password_Policy\Tests\Validator; diff --git a/tests/lib/Validator/NumericCharacterValidatorTest.php b/tests/lib/Validator/NumericCharacterValidatorTest.php index 1468676f..4512b269 100644 --- a/tests/lib/Validator/NumericCharacterValidatorTest.php +++ b/tests/lib/Validator/NumericCharacterValidatorTest.php @@ -1,26 +1,9 @@ - * - * @author Roeland Jago Douma - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * +/*! + * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\Password_Policy\Tests\Validator; diff --git a/tests/lib/Validator/SpecialCharactersValidatorTest.php b/tests/lib/Validator/SpecialCharactersValidatorTest.php index 5a3931f0..a419fd95 100644 --- a/tests/lib/Validator/SpecialCharactersValidatorTest.php +++ b/tests/lib/Validator/SpecialCharactersValidatorTest.php @@ -1,26 +1,9 @@ - * - * @author Roeland Jago Douma - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * +/*! + * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\Password_Policy\Tests\Validator; diff --git a/tests/lib/Validator/UpperCaseLowerCaseValidatorTest.php b/tests/lib/Validator/UpperCaseLowerCaseValidatorTest.php index 44449310..48fba79f 100644 --- a/tests/lib/Validator/UpperCaseLowerCaseValidatorTest.php +++ b/tests/lib/Validator/UpperCaseLowerCaseValidatorTest.php @@ -1,26 +1,9 @@ - * - * @author Roeland Jago Douma - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * +/*! + * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\Password_Policy\Tests\Validator; diff --git a/tests/phpunit.xml b/tests/phpunit.xml index 0af1e431..3e253b21 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -1,4 +1,8 @@ +