Commit 469f6daa authored by Thomas Maroschik's avatar Thomas Maroschik Committed by Christian Kuhn
Browse files

[TASK] Fix system extensions composer.json type entry

The current composer type of system extensions is "typo3cms-framework".
In the composer installer for TYPO3 CMS the composer type of extensions
is "typo3-cms-extension". In order to align our composer type with the
community defined it is changed to "typo3-cms-framework".

Resolves: #52831
Releases: 6.2
Change-Id: I1f43a60bd4cf59b47163123b57c8ba09e35e6526
Reviewed-on: https://review.typo3.org/24780
Reviewed-by: Sebastian Fischer
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
parent dc3bcfc0
{
"name": "typo3/cms/about",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/aboutmodules",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/adodb",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/backend",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/belog",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/beuser",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/cms",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/context-help",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
......@@ -109,7 +109,7 @@ class Package extends \TYPO3\Flow\Package\Package implements PackageInterface {
$extensionManagerConfiguration = $this->extensionManagerConfiguration;
$composerManifest = $this->composerManifest = new \stdClass();
$composerManifest->name = $this->getPackageKey();
$composerManifest->type = 'typo3cms-extension';
$composerManifest->type = 'typo3-cms-extension';
$composerManifest->description = $extensionManagerConfiguration['title'];
$composerManifest->version = $extensionManagerConfiguration['version'];
if (isset($extensionManagerConfiguration['constraints']['depends']) && is_array($extensionManagerConfiguration['constraints']['depends'])) {
......
......@@ -88,7 +88,7 @@ class PackageFactory extends \TYPO3\Flow\Package\PackageFactory {
if (!is_object($manifest)) {
throw new \TYPO3\Flow\Package\Exception\InvalidPackageManifestException('Invalid composer manifest.', 1348146450);
}
if (isset($manifest->type) && substr($manifest->type, 0, 9) === 'typo3cms-') {
if (isset($manifest->type) && substr($manifest->type, 0, 10) === 'typo3-cms-') {
$relativePackagePath = substr($packagePath, strlen($packagesBasePath));
$packageKey = substr($relativePackagePath, strpos($relativePackagePath, '/') + 1, -1);
/**
......
{
"name": "typo3/cms/core",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/cshmanual",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/css-styled-content",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/dbal",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/documentation",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/extbase",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/extensionmanager",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/extra-page-cm-options",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
{
"name": "typo3/cms/feedit",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-3.0+"],
......
{
"name": "typo3/cms/felogin",
"type": "typo3cms-framework",
"type": "typo3-cms-framework",
"description": "TYPO3 Core",
"homepage": "http://typo3.org",
"license": ["GPL-2.0+"],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment