[TASK] Update composer.json due to merge / rebase conflicts

Related: #691
Signed-off-by: Marcus Schwemer <marcus.schwemer@in2code.de>

Author: mschwemer

composer.json

@@ -12,6 +12,12 @@
 		{
 			"name": "Alex Kellner",
 			"email": "alexander.kellner@in2code.de"
+		},
+		{
+			"name": "Marcus Schwemer",
+			"email": "marcus.schwemer@in2code.de",
+			"role": "Developer",
+			"homepage": "https://www.in2code.de"
 		}
 	],
 	"type": "typo3-cms-extension",
@@ -54,7 +60,8 @@
 		"phpmd/phpmd": "^2.8",
 		"helhum/typo3-console": "^6.3",
 		"friendsofphp/php-cs-fixer": "^2.19",
-		"genesis/behat-fail-aid": "^3.7"
+		"genesis/behat-fail-aid": "^3.7",
+		"helmich/typo3-typoscript-lint": "^2.5"
 	},
 	"autoload": {
 		"psr-4": {
@@ -89,91 +96,9 @@
 	},
 	"extra": {
 		"typo3/cms": {
+			"cms-package-dir": "{$vendor-dir}/typo3/cms",
 			"web-dir": ".Build/Web",
 			"extension-key": "powermail"
 		}
 	}
-  "name": "in2code/powermail",
-  "description": "Powermail is a well-known, editor-friendly, powerful and easy to use mailform extension with a lots of features",
-  "keywords": [
-    "typo3",
-    "form",
-    "mailform",
-    "spamprevention"
-  ],
-  "homepage": "https://github.com/einpraegsam/powermail",
-  "authors": [
-    {
-      "name": "Alex Kellner",
-      "email": "alexander.kellner@in2code.de",
-      "role": "Product and technical owner",
-      "homepage": "https://www.in2code.de"
-    },
-    {
-      "name": "Marcus Schwemer",
-      "email": "marcus.schwemer@in2code.de",
-      "role": "Developer",
-      "homepage": "https://www.in2code.de"
-    }
-  ],
-  "type": "typo3-cms-extension",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "typo3/cms-core": "^10.4",
-    "ext-json": "*",
-    "ext-gd": "*",
-    "ext-fileinfo": "*",
-    "ext-curl": "*"
-  },
-  "replace": {
-    "typo3-ter/powermail": "self.version"
-  },
-  "require-dev": {
-    "typo3/cms-core": "^10.4",
-    "nimut/testing-framework": "^5.0",
-    "mikey179/vfsstream": "^1.6",
-    "phpunit/phpunit": "^6.0",
-    "behat/behat": "^3.5",
-    "behat/mink-extension": "^2.3",
-    "behat/mink-goutte-driver": "^1.2",
-    "behat/mink-selenium2-driver": "^1.3",
-    "se/selenium-server-standalone": "^3",
-    "squizlabs/php_codesniffer": "^3.5",
-    "phpmd/phpmd": "^2.8",
-    "friendsofphp/php-cs-fixer": "^2.19",
-    "helmich/typo3-typoscript-lint": "^2.5"
-  },
-  "autoload": {
-    "psr-4": {
-      "In2code\\Powermail\\": "Classes/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "In2code\\Powermail\\Tests\\": "Tests",
-      "TYPO3\\CMS\\Core\\Tests\\": ".Build/vendor/typo3/cms/typo3/sysext/core/Tests/",
-      "TYPO3\\CMS\\Fluid\\Tests\\": ".Build/vendor/typo3/cms/typo3/sysext/fluid/Tests/"
-    }
-  },
-  "config": {
-    "vendor-dir": ".Build/vendor",
-    "bin-dir": ".Build/bin"
-  },
-  "scripts": {
-    "post-autoload-dump": [
-      "mkdir -p .Build/Web/typo3conf/ext/",
-      "[ -L .Build/Web/typo3conf/ext/powermail ] || ln -snvf ../../../../. .Build/Web/typo3conf/ext/powermail"
-    ],
-    "test:unit": "phpunit -c phpunit.xml.dist",
-    "test:php:lint": "find *.php Classes Configuration Tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l",
-    "test:php:cs": "php-cs-fixer fix --dry-run --config=.project/tests/.php-cs-fixer.php --diff",
-    "test:ts:lint": "typoscript-lint -c .project/tests/typoscript-lint.yml --fail-on-warnings"
-  },
-  "extra": {
-    "typo3/cms": {
-      "cms-package-dir": "{$vendor-dir}/typo3/cms",
-      "web-dir": ".Build/Web",
-      "extension-key": "powermail"
-    }
-  }
 }