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

Clean composer.json file

* Do not use typo3-ter composer packages
* Move bin folder to vendor/bin
* Adjust ddev and deployment to use vendor/bin
* Remove composer.typo3.org
parent c5019ad8
Pipeline #4798 passed with stages
in 2 minutes and 41 seconds
......@@ -14,5 +14,5 @@ hooks:
- exec: composer install -d /var/www/html
- exec: npm --prefix typo3conf/ext/t3olayout/Build install
- exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build
- exec: ../bin/typo3cms install:generatepackagestates
- exec: ../bin/typo3cms install:extensionsetupifpossible
- exec: ../vendor/bin/typo3cms install:generatepackagestates
- exec: ../vendor/bin/typo3cms install:extensionsetupifpossible
......@@ -3,8 +3,6 @@
namespace Deployer;
require_once '/composer/vendor/deployer/deployer/recipe/common.php';
require_once '/composer/vendor/deployer/recipes/rsync.php';
$sharedDirectories = [
'html/fileadmin',
......@@ -54,14 +52,15 @@ set('rsync_src', './');
set('keep_releases', 10);
serverList('./.gitlab-ci/deployer/servers.yml');
set('php', '/opt/php/php70/bin/php');
set('typo3_console', 'vendor/bin/typo3cms');
task('typo3', function () {
run('cd {{release_path}} && {{php}} bin/typo3cms install:generatepackagestates');
run('cd {{release_path}} && {{php}} bin/typo3cms install:extensionsetupifpossible');
run('cd {{release_path}} && {{php}} {{typo3_console}} install:generatepackagestates');
run('cd {{release_path}} && {{php}} {{typo3_console}} install:extensionsetupifpossible');
});
task('cache', function () {
run('cd {{release_path}} && {{php}} bin/cachetool opcache:reset');
run('cd {{release_path}} && {{php}} {{typo3_console}} opcache:reset');
});
task('deploy', [
......
......@@ -8,18 +8,10 @@
}
],
"repositories": [
{
"type": "composer",
"url": "https://composer.typo3.org"
},
{
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git"
},
{
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/t3o_slack.git"
},
{
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/t3o_ldap.git"
......@@ -28,31 +20,32 @@
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/gitlab_api.git"
}
],
"support": {
"email": "maintenance@typo3.org",
"issues": "https://git-t3o.typo3.org/t3o/my/issues"
},
"require": {
"typo3/cms": "^8.7",
"helhum/typo3-console": "^5.0",
"dmitryd/typo3-realurl": "^2.1",
"t3o/t3olayout": "^3.0",
"t3o/t3o_ldap": "^1.0",
"typo3-ter/femanager": "^4.0",
"in2code/femanager": "^4.0",
"in2code/userprofile": "^0.2",
"sjbr/static-info-tables": "^6.5",
"t3o/gitlab_api": "^1.0",
"gordalina/cachetool": "^3.2"
},
"config": {
"bin-dir": "bin"
"platform": {
"php": "7.0.30"
}
},
"extra": {
"typo3/cms": {
"web-dir": "html",
"cms-package-dir": "{$vendor-dir}/typo3/cms"
},
"helhum/typo3-console": {
"install-binary": true,
"install-extension-dummy": false
}
},
"autoload": {
......
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "cd092c320fe09c3e8df3452f3c937aed",
"content-hash": "6e2c4c42e3eca67d4850887bd19d94aa",
"packages": [
{
"name": "adoy/fastcgi-client",
......@@ -1106,6 +1106,73 @@
],
"time": "2017-12-13T13:52:52+00:00"
},
{
"name": "in2code/femanager",
"version": "4.2.2",
"source": {
"type": "git",
"url": "https://github.com/in2code-de/femanager.git",
"reference": "72131aea44570406a419ee28a317beabe59aa7ac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/in2code-de/femanager/zipball/72131aea44570406a419ee28a317beabe59aa7ac",
"reference": "72131aea44570406a419ee28a317beabe59aa7ac",
"shasum": ""
},
"require": {
"typo3/cms-core": ">=8.7.0 <9.0.0"
},
"replace": {
"femanager": "self.version",
"typo3-ter/femanager": "self.version"
},
"require-dev": {
"behat/behat": "^3.4",
"behat/mink-extension": "^2.1",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "^1.3",
"mikey179/vfsstream": "^1.4",
"nimut/testing-framework": "^1.0",
"phpunit/phpunit": "^4.7 || ^5.0",
"se/selenium-server-standalone": "^2.0",
"typo3/cms-extbase": "^8.7.10"
},
"type": "typo3-cms-extension",
"extra": {
"typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": ".Build/Web"
}
},
"autoload": {
"psr-4": {
"In2code\\Femanager\\": "Classes/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "Alex Kellner",
"email": "alexander.kellner@in2code.de"
}
],
"description": "Modern TYPO3 Frontend User Registration.",
"homepage": "https://github.com/in2code-de/femanager",
"keywords": [
"fe_users",
"form",
"frontend",
"profile",
"registration",
"sr_feuser_register",
"typo3"
],
"time": "2018-05-11T11:47:21+00:00"
},
{
"name": "in2code/userprofile",
"version": "0.2.1",
......@@ -2079,43 +2146,6 @@
],
"time": "2018-06-23T12:01:52+00:00"
},
{
"name": "typo3-ter/femanager",
"version": "4.2.2",
"dist": {
"type": "zip",
"url": "https://extensions.typo3.org/extension/download/femanager/4.2.2/zip/",
"reference": null,
"shasum": null
},
"require": {
"php": ">= 7.0.0, <= 7.2.99",
"typo3/cms-core": ">= 8.7.0, <= 8.7.99"
},
"replace": {
"femanager": "self.version"
},
"suggest": {
"typo3-ter/sr-freecap": ">= 2.3.0, <= 2.99.99",
"typo3-ter/static-info-tables": ">= 6.0.0, <= 6.99.99"
},
"type": "typo3-cms-extension",
"autoload": {
"psr-4": {
"In2code\\Femanager\\": "Classes/"
}
},
"authors": [
{
"name": "Alexander Kellner, Stefan Busemann",
"email": "info@in2code.de",
"company": "in2code.de - Wir leben TYPO3",
"username": "in2code"
}
],
"description": "TYPO3 Frontend User Registration and Management based on\n Extbase and Fluid and on TYPO3 8 and the possibility to extend it.\n Extension basicly works like sr_feuser_register",
"time": "2018-05-11T13:49:48+00:00"
},
{
"name": "typo3-ter/ig-ldap-sso-auth",
"version": "3.3.0",
......@@ -2529,5 +2559,8 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
"platform-dev": []
"platform-dev": [],
"platform-overrides": {
"php": "7.0.30"
}
}
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