From 11292c2e18e846fd033990811f996bad8c9fecdb Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Wed, 14 Sep 2022 11:23:32 +0200
Subject: [PATCH] Remove API Key from site configuration (#72)

The key is configured via Extension Configuration.
Documentation and code match, but we still extended the site
configuration.

Resolves: #55
---
 .../SiteConfiguration/Overrides/sites.php     | 27 -------------------
 Documentation/Changelog/1.3.0.rst             |  4 ++-
 phpstan-baseline.neon                         |  5 ----
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 Configuration/SiteConfiguration/Overrides/sites.php

diff --git a/Configuration/SiteConfiguration/Overrides/sites.php b/Configuration/SiteConfiguration/Overrides/sites.php
deleted file mode 100644
index 2c644b4..0000000
--- a/Configuration/SiteConfiguration/Overrides/sites.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-defined('TYPO3') or die();
-
-(static function (string $extensionKey, string $tableName) {
-    $languagePath = \WerkraumMedia\ThueCat\Extension::getLanguagePath() . 'locallang_be.xlf:' . $tableName . '.';
-
-    \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($GLOBALS['SiteConfiguration']['site'], [
-        'columns' => [
-            'thuecat_api_key' => [
-                'label' => $languagePath . 'thuecat_api_key',
-                'config' => [
-                    'type' => 'input',
-                ],
-            ],
-        ],
-        'types' => [
-            '0' => [
-                'showitem' => $GLOBALS['SiteConfiguration']['site']['types']['0']['showitem']
-                . ', ' . implode(',', [
-                    '--div--;' . $languagePath . 'div.thuecat',
-                    'thuecat_api_key',
-                ]),
-            ],
-        ],
-    ]);
-})(\WerkraumMedia\ThueCat\Extension::EXTENSION_KEY, 'site');
diff --git a/Documentation/Changelog/1.3.0.rst b/Documentation/Changelog/1.3.0.rst
index 168c670..6635986 100644
--- a/Documentation/Changelog/1.3.0.rst
+++ b/Documentation/Changelog/1.3.0.rst
@@ -19,7 +19,9 @@ Nothing
 Tasks
 -----
 
-Nothing
+Removed API Key from site configuration.
+The key was already moved to extension configuration as documented.
+Still we extended the site configuration, which is now cleaned up, see: https://github.com/werkraum-media/thuecat/issues/55
 
 Deprecation
 -----------
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 0ac867c..72cf78f 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -284,11 +284,6 @@ parameters:
 			count: 1
 			path: Classes/Frontend/DataProcessing/ResolveEntities.php
 
-		-
-			message: "#^Right side of \\|\\| is always false\\.$#"
-			count: 1
-			path: Configuration/SiteConfiguration/Overrides/sites.php
-
 		-
 			message: "#^Right side of \\|\\| is always false\\.$#"
 			count: 1