Commit ddcf85aa authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Clean composer.json

* Remove composer.typo3.org repository
* Update typo3_console to ^5.0
* Move bin folder to vendor/bin
* Adjust ddev and deployment to the new bin folder
parent 2ea71b81
Pipeline #4803 passed with stages
in 5 minutes and 19 seconds
...@@ -14,7 +14,7 @@ hooks: ...@@ -14,7 +14,7 @@ hooks:
- exec: composer install -d /var/www/html - exec: composer install -d /var/www/html
- exec: npm --prefix typo3conf/ext/t3olayout/Build install - exec: npm --prefix typo3conf/ext/t3olayout/Build install
- exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build - exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build
- exec: ../bin/typo3cms install:generatepackagestates - exec: ../vendor/bin/typo3cms install:generatepackagestates
- exec: ../bin/typo3cms install:extensionsetupifpossible - exec: ../vendor/bin/typo3cms install:extensionsetupifpossible
# temporary activation of redirects until upgrade to v9 # temporary activation of redirects until upgrade to v9
- exec: ../bin/typo3cms extension:activate redirects - exec: ../vendor/bin/typo3cms extension:activate redirects
...@@ -54,17 +54,18 @@ set('rsync_src', './'); ...@@ -54,17 +54,18 @@ set('rsync_src', './');
set('keep_releases', 10); set('keep_releases', 10);
serverList('.gitlab-ci/deployer/servers.yml'); serverList('.gitlab-ci/deployer/servers.yml');
set('php', '/opt/php/php70/bin/php'); set('php', '/opt/php/php70/bin/php');
set('typo3_console', 'vendor/bin/typo3cms');
task('typo3', function () { task('typo3', function () {
run('cd {{release_path}} && {{php}} bin/typo3cms install:generatepackagestates'); run('cd {{release_path}} && {{php}} {{typo3_console}} install:generatepackagestates');
run('cd {{release_path}} && {{php}} bin/typo3cms install:extensionsetupifpossible'); run('cd {{release_path}} && {{php}} {{typo3_console}} install:extensionsetupifpossible');
// temporary activation of redirects module until upgrade to v9 // temporary activation of redirects module until upgrade to v9
run('cd {{release_path}} && {{php}} composer.phar install'); run('cd {{release_path}} && {{php}} composer install');
run('cd {{release_path}} && {{php}} bin/typo3cms extension:activate redirects'); run('cd {{release_path}} && {{php}} {{typo3_console}} extension:activate redirects');
}); });
task('cache', function () { task('cache', function () {
run('cd {{release_path}} && {{php}} bin/cachetool opcache:reset'); run('cd {{release_path}} && {{php}} vendor/bin/cachetool opcache:reset');
}); });
task('deploy', [ task('deploy', [
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
"email": "maintenance@typo3.org" "email": "maintenance@typo3.org"
} }
], ],
"support": {
"email": "maintenance@typo3.org",
"issues": "https://git-t3o.typo3.org/t3o/typo3.org/issues"
},
"repositories": [ "repositories": [
{
"type": "composer",
"url": "https://composer.typo3.org"
},
{ {
"type": "vcs", "type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git" "url": "https://git-t3o.typo3.org/t3o/t3olayout.git"
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
} }
], ],
"require": { "require": {
"typo3/cms": "^8.7", "typo3/cms-core": "^8.7",
"typo3/cms-linkvalidator": "*", "typo3/cms-linkvalidator": "*",
"helhum/typo3-console": "4.9.2", "helhum/typo3-console": "^5.0",
"dmitryd/typo3-realurl": "2.3.0", "dmitryd/typo3-realurl": "2.3.0",
"t3o/t3olayout": "^3.0", "t3o/t3olayout": "^3.0",
"t3o/certifications": "^1.0", "t3o/certifications": "^1.0",
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
"mabahe/typo3-core-redirects": "^8.7" "mabahe/typo3-core-redirects": "^8.7"
}, },
"config": { "config": {
"bin-dir": "bin",
"platform": { "platform": {
"php": "7.0.30" "php": "7.0.30"
} }
...@@ -72,10 +71,6 @@ ...@@ -72,10 +71,6 @@
"web-dir": "html", "web-dir": "html",
"cms-package-dir": "{$vendor-dir}/typo3/cms" "cms-package-dir": "{$vendor-dir}/typo3/cms"
}, },
"helhum/typo3-console": {
"install-binary": true,
"install-extension-dummy": false
},
"enable-patching": true "enable-patching": true
}, },
"autoload": { "autoload": {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "56db70f13fdee61a6a2bc364e98cd00f", "content-hash": "7308b1c02e37f1da146e947bdb41c0e8",
"packages": [ "packages": [
{ {
"name": "adoy/fastcgi-client", "name": "adoy/fastcgi-client",
...@@ -1240,56 +1240,112 @@ ...@@ -1240,56 +1240,112 @@
], ],
"time": "2017-03-20T17:10:46+00:00" "time": "2017-03-20T17:10:46+00:00"
}, },
{
"name": "helhum/config-loader",
"version": "v0.9.0",
"source": {
"type": "git",
"url": "https://github.com/helhum/config-loader.git",
"reference": "11188d23b3c5e1e3fb61de9d7e3d6ddaae3cf389"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/helhum/config-loader/zipball/11188d23b3c5e1e3fb61de9d7e3d6ddaae3cf389",
"reference": "11188d23b3c5e1e3fb61de9d7e3d6ddaae3cf389",
"shasum": ""
},
"require": {
"php": ">=7.0.0 <7.3.0"
},
"require-dev": {
"mikey179/vfsstream": "^1.6",
"phpunit/phpunit": "^5.0",
"symfony/yaml": "^2.8 || ^3.3 || ^4.0"
},
"suggest": {
"ext-yaml": "For improved performance when parsing yaml files you should use the PECL YAML Parser php extension",
"symfony/yaml": "To be able to parse yaml files, you will need symfony/yaml"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Helhum\\ConfigLoader\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
"description": "Generic config loader with context and environment support.",
"time": "2018-06-14T12:33:08+00:00"
},
{ {
"name": "helhum/typo3-console", "name": "helhum/typo3-console",
"version": "4.9.2", "version": "5.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/TYPO3-Console/TYPO3-Console.git", "url": "https://github.com/TYPO3-Console/TYPO3-Console.git",
"reference": "d142f37ad2564e149e5cb77bd361d39a544de42e" "reference": "22f08f288bde34aeec00e1c77a3fbf786038f0b5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/d142f37ad2564e149e5cb77bd361d39a544de42e", "url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/22f08f288bde34aeec00e1c77a3fbf786038f0b5",
"reference": "d142f37ad2564e149e5cb77bd361d39a544de42e", "reference": "22f08f288bde34aeec00e1c77a3fbf786038f0b5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-phar": "*", "doctrine/annotations": "^1.4",
"helhum/typo3-console-plugin": "^1.7.5 || ^2.0.2", "helhum/config-loader": "^0.9.0",
"php": ">=5.5.0 <7.2", "helhum/typo3-console-plugin": "^2.0.2",
"symfony/console": "^2.7 || ^3.0", "php": ">=7.0.0 <7.3",
"symfony/process": "^2.7 || ^3.0", "symfony/console": "^3.4.4 || ^4.0",
"typo3/cms-backend": "^7.6 || ^8.7", "symfony/process": "^3.4.4 || ^4.0",
"typo3/cms-core": "^7.6 || ^8.7", "typo3/cms-backend": "^8.7.10 || >=9.1.0 <9.4",
"typo3/cms-extbase": "^7.6 || ^8.7", "typo3/cms-core": "^8.7.10 || >=9.1.0 <9.4",
"typo3/cms-extensionmanager": "^7.6 || ^8.7", "typo3/cms-extbase": "^8.7.10 || >=9.1.0 <9.4",
"typo3/cms-fluid": "^7.6 || ^8.7", "typo3/cms-extensionmanager": "^8.7.10 || >=9.1.0 <9.4",
"typo3/cms-install": "^7.6 || ^8.7", "typo3/cms-fluid": "^8.7.10 || >=9.1.0 <9.4",
"typo3/cms-scheduler": "^7.6 || ^8.7" "typo3/cms-frontend": "^8.7.10 || >=9.1.0 <9.4",
"typo3/cms-install": "^8.7.10 || >=9.1.0 <9.4",
"typo3/cms-saltedpasswords": "^8.7.10 || >=9.1.0 <9.4",
"typo3/cms-scheduler": "^8.7.10 || >=9.1.0 <9.4"
},
"conflict": {
"friendsoftypo3/dbal": "*",
"symfony/finder": "2.7.44 || 2.8.37 || 3.4.7 || 4.0.7",
"typo3-ter/dbal": "*"
}, },
"replace": { "replace": {
"typo3-ter/typo3-console": "self.version", "typo3-ter/typo3-console": "self.version",
"typo3/cms-cli": "*",
"typo3_console": "self.version" "typo3_console": "self.version"
}, },
"require-dev": { "require-dev": {
"mikey179/vfsstream": "~1.6.0", "cweagans/composer-patches": "^1.6",
"nimut/testing-framework": "^1.0", "nimut/testing-framework": "dev-master",
"symfony/filesystem": "^3.2", "symfony/filesystem": "^3.2",
"typo3-console/create-reference-command": "^1.0", "typo3-console/create-reference-command": "@dev",
"typo3/cms": "^8.7" "typo3-console/php-server-command": "^0.2",
"typo3/cms-filemetadata": "^8.7.10 || >=9.1.0 <9.4 || 9.4.*@dev",
"typo3/cms-reports": "^8.7.10 || >=9.1.0 <9.4 || 9.4.*@dev"
}, },
"bin": [ "bin": [
"Scripts/typo3cms" "typo3cms"
], ],
"type": "library", "type": "library",
"extra": { "extra": {
"patches-file": "Resources/Private/Patches/patches.json",
"branch-alias": { "branch-alias": {
"dev-master": "4.x-dev" "dev-master": "5.x-dev"
}, },
"typo3/cms": { "typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms", "app-dir": ".Build",
"web-dir": ".Build/Web", "web-dir": ".Build/public",
"Package": { "Package": {
"partOfMinimalUsableSystem": true "partOfMinimalUsableSystem": true
} }
...@@ -1298,14 +1354,14 @@ ...@@ -1298,14 +1354,14 @@
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Helhum\\Typo3Console\\": [ "Helhum\\Typo3Console\\": [
"Classes/", "Classes/Console/",
"Resources/Private/ExtensionArtifacts/src/" "Classes/Compatibility/"
] ]
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"GPL-2.0+" "GPL-2.0-or-later"
], ],
"authors": [ "authors": [
{ {
...@@ -1324,7 +1380,7 @@ ...@@ -1324,7 +1380,7 @@
"console", "console",
"typo3" "typo3"
], ],
"time": "2017-10-06T10:32:21+00:00" "time": "2018-06-19T12:00:57+00:00"
}, },
{ {
"name": "helhum/typo3-console-plugin", "name": "helhum/typo3-console-plugin",
...@@ -2821,40 +2877,6 @@ ...@@ -2821,40 +2877,6 @@
], ],
"time": "2018-06-11T17:18:14+00:00" "time": "2018-06-11T17:18:14+00:00"
}, },
{
"name": "typo3/cms-cli",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/cms-cli.git",
"reference": "c27c3580b384353414d0b4ff61137127798f8189"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/cms-cli/zipball/c27c3580b384353414d0b4ff61137127798f8189",
"reference": "c27c3580b384353414d0b4ff61137127798f8189",
"shasum": ""
},
"require": {
"php": "^7.0"
},
"bin": [
"typo3"
],
"type": "library",
"autoload": {
"psr-4": {
"TYPO3\\CMS\\Cli\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "TYPO3 command line binary",
"homepage": "https://typo3.org",
"time": "2017-09-06T12:09:47+00:00"
},
{ {
"name": "typo3/cms-composer-installers", "name": "typo3/cms-composer-installers",
"version": "v1.5.2", "version": "v1.5.2",
......
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