From 6d286c9170c451615992a26d4be069d11fdbdd61 Mon Sep 17 00:00:00 2001 From: Art4 Date: Fri, 13 Oct 2023 13:03:52 +0200 Subject: [PATCH] set all files REUSE compliant for some reasons the .gitignore entries are ignored by reuse tool so I have to put them into .reuse/deb5 file --- .gitattributes | 3 ++ .gitignore | 2 - .php-cs-fixer.dist.php | 4 ++ .phpstan.neon | 3 ++ .reuse/dep5 | 53 +++++++++++++++++-- composer.json | 3 +- docker-compose.yml | 3 ++ tests/files/01_simple_resource.json.license | 3 -- ...02_simple_resource_identifier.json.license | 3 -- tests/files/03_resource_object.json.license | 3 -- ...t_with_multiple_relationships.json.license | 3 -- .../files/05_simple_meta_object.json.license | 3 -- .../files/06_pagination_example.json.license | 3 -- ...tionship_example_without_data.json.license | 3 -- tests/files/08_object_links.json.license | 3 -- tests/files/09_errors.json.license | 3 -- tests/files/10_error_with_links.json.license | 3 -- ...resource_identifier_with_meta.json.license | 3 -- tests/files/12_null_resource.json.license | 3 -- ...resource_identifier_with_meta.json.license | 3 -- ...14_create_resource_without_id.json.license | 3 -- ...15_create_resource_without_id.json.license | 3 -- .../16_type_and_id_as_integer.json.license | 3 -- .../files/17_relationship_links.json.license | 3 -- 24 files changed, 65 insertions(+), 57 deletions(-) delete mode 100644 tests/files/01_simple_resource.json.license delete mode 100644 tests/files/02_simple_resource_identifier.json.license delete mode 100644 tests/files/03_resource_object.json.license delete mode 100644 tests/files/04_complete_document_with_multiple_relationships.json.license delete mode 100644 tests/files/05_simple_meta_object.json.license delete mode 100644 tests/files/06_pagination_example.json.license delete mode 100644 tests/files/07_relationship_example_without_data.json.license delete mode 100644 tests/files/08_object_links.json.license delete mode 100644 tests/files/09_errors.json.license delete mode 100644 tests/files/10_error_with_links.json.license delete mode 100644 tests/files/11_resource_identifier_with_meta.json.license delete mode 100644 tests/files/12_null_resource.json.license delete mode 100644 tests/files/13_collection_with_resource_identifier_with_meta.json.license delete mode 100644 tests/files/14_create_resource_without_id.json.license delete mode 100644 tests/files/15_create_resource_without_id.json.license delete mode 100644 tests/files/16_type_and_id_as_integer.json.license delete mode 100644 tests/files/17_relationship_links.json.license diff --git a/.gitattributes b/.gitattributes index ba9bf4c..08346ef 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +# SPDX-License-Identifier: GPL-3.0-or-later + /.docker export-ignore /.gitattributes export-ignore /.gitignore export-ignore diff --git a/.gitignore b/.gitignore index 8bacd1c..296372e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ .idea .php-cs-fixer.cache .phpunit.cache -composer.phar composer.lock -php-cs-fixer.phar vendor diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index d7e3dd9..e159e9f 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -1,5 +1,9 @@ in('src') ->in('tests') diff --git a/.phpstan.neon b/.phpstan.neon index cdc94e3..8136274 100644 --- a/.phpstan.neon +++ b/.phpstan.neon @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +# SPDX-License-Identifier: GPL-3.0-or-later + parameters: level: 8 diff --git a/.reuse/dep5 b/.reuse/dep5 index 5727ad7..9c6a545 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -9,10 +9,57 @@ Source: https://github.com/Art4/json-api-client # Copyright: $YEAR $NAME <$CONTACT> # License: ... -Files: src/* +Files: .docker/* Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt License: GPL-3.0-or-later -Files: tests/* +Files: .github/* Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt -License: GPL-3.0-or-later \ No newline at end of file +License: GPL-3.0-or-later + +Files: .gitignore +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later + +Files: CHANGELOG.md +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later + +Files: composer.json +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later + +Files: composer.lock +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later + +Files: docs/* +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later + +Files: phpunit.xml +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later + +Files: README.md +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later + +Files: tests/files/* +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later + +# Ignore following folders +# for some reason reuse does not ignore files definded in .gitignore + +Files: .phpunit.cache/* +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later + +Files: .php-cs-fixer.cache +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later + +Files: vendor/* +Copyright: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +License: GPL-3.0-or-later diff --git a/composer.json b/composer.json index 1982660..99c926e 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,8 @@ "coverage": "phpunit --coverage-html=\".phpunit.cache/code-coverage\"", "phpstan": "phpstan analyze --memory-limit 512M --configuration .phpstan.neon", "phpunit": "phpunit", - "reuse-annotate": "pipx run reuse annotate src tests --license=\"GPL-3.0-or-later\" --copyright=\"2015-2023 Artur Weigandt https://wlabs.de/kontakt\" --recursive --exclude-year --copyright-style=\"spdx\"" + "reuse-annotate": "pipx run reuse annotate src tests --license=\"GPL-3.0-or-later\" --copyright=\"2015-2023 Artur Weigandt https://wlabs.de/kontakt\" --recursive --exclude-year --copyright-style=\"spdx\"", + "reuse-lint": "pipx run reuse --suppress-deprecation lint" }, "config": { "sort-packages": true diff --git a/docker-compose.yml b/docker-compose.yml index 7675f0c..e51cf35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt +# SPDX-License-Identifier: GPL-3.0-or-later + version: "3.7" services: diff --git a/tests/files/01_simple_resource.json.license b/tests/files/01_simple_resource.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/01_simple_resource.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/02_simple_resource_identifier.json.license b/tests/files/02_simple_resource_identifier.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/02_simple_resource_identifier.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/03_resource_object.json.license b/tests/files/03_resource_object.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/03_resource_object.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/04_complete_document_with_multiple_relationships.json.license b/tests/files/04_complete_document_with_multiple_relationships.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/04_complete_document_with_multiple_relationships.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/05_simple_meta_object.json.license b/tests/files/05_simple_meta_object.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/05_simple_meta_object.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/06_pagination_example.json.license b/tests/files/06_pagination_example.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/06_pagination_example.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/07_relationship_example_without_data.json.license b/tests/files/07_relationship_example_without_data.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/07_relationship_example_without_data.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/08_object_links.json.license b/tests/files/08_object_links.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/08_object_links.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/09_errors.json.license b/tests/files/09_errors.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/09_errors.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/10_error_with_links.json.license b/tests/files/10_error_with_links.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/10_error_with_links.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/11_resource_identifier_with_meta.json.license b/tests/files/11_resource_identifier_with_meta.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/11_resource_identifier_with_meta.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/12_null_resource.json.license b/tests/files/12_null_resource.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/12_null_resource.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/13_collection_with_resource_identifier_with_meta.json.license b/tests/files/13_collection_with_resource_identifier_with_meta.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/13_collection_with_resource_identifier_with_meta.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/14_create_resource_without_id.json.license b/tests/files/14_create_resource_without_id.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/14_create_resource_without_id.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/15_create_resource_without_id.json.license b/tests/files/15_create_resource_without_id.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/15_create_resource_without_id.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/16_type_and_id_as_integer.json.license b/tests/files/16_type_and_id_as_integer.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/16_type_and_id_as_integer.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/files/17_relationship_links.json.license b/tests/files/17_relationship_links.json.license deleted file mode 100644 index f1324b1..0000000 --- a/tests/files/17_relationship_links.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2023 Artur Weigandt https://wlabs.de/kontakt - -SPDX-License-Identifier: GPL-3.0-or-later