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

Move project extensions to seperate folder and use private / public way

parent b0fe2bad
Pipeline #5639 failed with stages
in 5 minutes and 44 seconds
......@@ -14,15 +14,15 @@ hooks:
post-start:
- exec: sudo apt-get update
- exec: sudo apt-get install php7.0-ldap -y
- exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php
- exec: cp ../private/typo3conf/AdditionalConfiguration.ddev.php ../private/typo3conf/AdditionalConfiguration.php
- 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: npm --prefix ../private/typo3conf/ext/t3olayout/Build install
- exec: npm --prefix ../private/typo3conf/ext/t3olayout/Build run-script build
- exec: ../vendor/bin/typo3cms install:generatepackagestates
- exec: ../vendor/bin/typo3cms install:extensionsetupifpossible
# This config.yaml was created with ddev version v1.2.0
# This config.yaml was created with ddev version v1.2.0
# webimage: drud/ddev-webserver:v1.2.0
# dbimage: drud/ddev-dbserver:v1.2.0
# dbaimage: drud/phpmyadmin:v1.2.0
......@@ -80,4 +80,4 @@ hooks:
# for them. Example:
#hooks:
# post-start:
# - exec: composer install -d /var/www/html
\ No newline at end of file
# - exec: composer install -d /var/www/html
# Created by .ignore support plugin (hsz.mobi)
.idea
typo3_src
bin/*
!bin/scripts/
vendor
html/fileadmin
html/typo3temp
html/uploads
html/typo3
html/index.php
html/.htaccess
html/typo3conf/ext/*
html/typo3conf/AdditionalConfiguration.php
html/typo3conf/deprecation_*
html/typo3conf/ENABLE_INSTALL_TOOL
html/typo3conf/PackageStates.php
!html/typo3conf/ext/ter*
data/etc/solr/server/solr/mycores/t3o/data
html
private/fileadmin
private/typo3
private/index.php
private/typo3temp
private/uploads
private/typo3conf/ext/
private/typo3conf/PackageStates.php
private/typo3conf/AdditionalConfiguration.php
private/typo3conf/*.log
private/typo3conf/l10n/
{
"name": "t3o/ter",
"description": "Website for TYPO3 Extension Repository",
"authors": [
{
"name": "t3o team",
"email": "maintenance@typo3.org"
}
],
"support": {
"email": "maintenance@typo3.org",
"issues": "https://git-t3o.typo3.org/t3o/ter/issues"
},
"repositories": [
{
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git"
"name": "t3o/ter",
"description": "Website for TYPO3 Extension Repository",
"authors": [
{
"name": "t3o team",
"email": "maintenance@typo3.org"
}
],
"support": {
"email": "maintenance@typo3.org",
"issues": "https://git-t3o.typo3.org/t3o/ter/issues"
},
{
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/gitlab_api.git"
}
],
"require": {
"php": ">=7.0",
"typo3/cms-core": "^8.7",
"helhum/typo3-console": "^5.0",
"dmitryd/typo3-realurl": "^2.2",
"apache-solr-for-typo3/solr": "^7.0",
"t3o/t3olayout": "^3.0",
"nikic/php-parser": "^3.1",
"gordalina/cachetool": "^3.2"
},
"require-dev": {
"nimut/testing-framework": "^2.0"
},
"config": {
"store-auths": false,
"platform": {
"php": "7.0.30"
}
},
"extra": {
"typo3/cms": {
"web-dir": "html",
"cms-package-dir": "{$vendor-dir}/typo3/cms"
}
},
"autoload": {
"psr-4": {
"T3o\\Ter\\": "html/typo3conf/ext/ter/Classes",
"T3o\\TerFe2\\": "html/typo3conf/ext/ter_fe2/Classes"
"repositories": [
{
"type": "path",
"url": "extensions/*"
},
{
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git"
},
{
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/gitlab_api.git"
}
],
"require": {
"php": ">=7.0",
"typo3/cms-core": "^8.7",
"t3o/ter-layout": "@dev",
"t3o/ter-soap": "@dev",
"t3o/ter-frontend": "@dev",
"helhum/typo3-console": "^5.0",
"dmitryd/typo3-realurl": "^2.2",
"apache-solr-for-typo3/solr": "^7.0",
"t3o/t3olayout": "^3.0",
"nikic/php-parser": "^3.1",
"gordalina/cachetool": "^3.2",
"helhum/typo3-secure-web": "^0.2.7"
},
"classmap": [
"html/typo3conf/ext/ter_fe2/Classes/",
"html/typo3conf/ext/ter/"
]
},
"scripts": {
"test:unit": [
"./vendor/bin/phpunit -c .gitlab-ci/Tests/UnitTests.xml"
]
}
"require-dev": {
"nimut/testing-framework": "^2.0"
},
"config": {
"store-auths": false,
"platform": {
"php": "7.0.30"
}
},
"extra": {
"typo3/cms": {
"web-dir": "html",
"root-dir": "private"
}
},
"scripts": {
"test:unit": [
"./vendor/bin/phpunit -c .gitlab-ci/Tests/UnitTests.xml"
]
}
}
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "cfecbc0909fc8f9a5d9c2e0b156acde2",
"content-hash": "212c077f0a1581aa3a56bc86368be53c",
"packages": [
{
"name": "adoy/fastcgi-client",
......@@ -227,22 +227,22 @@
},
{
"name": "dmitryd/typo3-realurl",
"version": "2.3.0",
"version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/dmitryd/typo3-realurl.git",
"reference": "dbafbbae049f1dfa66c4510970a938f191fd10c1"
"reference": "4492e57ddaeda062ef802e840ffb02bab24816f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dmitryd/typo3-realurl/zipball/dbafbbae049f1dfa66c4510970a938f191fd10c1",
"reference": "dbafbbae049f1dfa66c4510970a938f191fd10c1",
"url": "https://api.github.com/repos/dmitryd/typo3-realurl/zipball/4492e57ddaeda062ef802e840ffb02bab24816f9",
"reference": "4492e57ddaeda062ef802e840ffb02bab24816f9",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": ">=5.4.0",
"typo3/cms-core": ">=6.2.0,<8.7.999"
"php": ">=5.4.0,<7.3.0",
"typo3/cms-core": ">=6.2.0,<9.0.0"
},
"conflict": {
"bednee/cooluri": ">0.0.1",
......@@ -290,7 +290,7 @@
"cms",
"typo3"
],
"time": "2017-10-05T00:00:00+00:00"
"time": "2018-07-09T00:00:00+00:00"
},
{
"name": "doctrine/annotations",
......@@ -1090,34 +1090,139 @@
],
"time": "2017-03-20T17:10:46+00:00"
},
{
"name": "helhum/config-loader",
"version": "v0.11.0",
"source": {
"type": "git",
"url": "https://github.com/helhum/config-loader.git",
"reference": "7748b96a80725fd8801075a4b75485889ac04779"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/helhum/config-loader/zipball/7748b96a80725fd8801075a4b75485889ac04779",
"reference": "7748b96a80725fd8801075a4b75485889ac04779",
"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-09-02T15:46:19+00:00"
},
{
"name": "helhum/typo3-composer-setup",
"version": "v0.5.3",
"source": {
"type": "git",
"url": "https://github.com/helhum/typo3-composer-setup.git",
"reference": "cf13489af8af80203814a1b79840e218b2e85b53"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/helhum/typo3-composer-setup/zipball/cf13489af8af80203814a1b79840e218b2e85b53",
"reference": "cf13489af8af80203814a1b79840e218b2e85b53",
"shasum": ""
},
"require": {
"typo3/cms-composer-installers": "^1.4 || ^2.0",
"typo3/minimal": "^7 || ^8 || ^9"
},
"require-dev": {
"typo3-console/php-server-command": "^0.1.0",
"typo3/cms-core": "dev-TYPO3_8-7 as 8.7.9"
},
"suggest": {
"helhum/typo3-console": "TYPO3 Console is highly recommended for any TYPO3 composer setup.",
"pagemachine/typo3-composer-legacy-cli ": "Provides the legacy cli_dispatch.phpsh entry point for TYPO3."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
},
"typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": "public"
},
"helhum/typo3-console": {
"install-extension-dummy": "0"
}
},
"autoload": {
"psr-4": {
"Helhum\\Typo3ComposerSetup\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "Helmut Hummel",
"email": "info@helhum.io",
"homepage": "https://helhum.io",
"role": "Developer"
}
],
"description": "Set up required entry points for TYPO3 web directory",
"time": "2018-06-26T12:47:04+00:00"
},
{
"name": "helhum/typo3-console",
"version": "5.0.3",
"version": "5.6.0",
"source": {
"type": "git",
"url": "https://github.com/TYPO3-Console/TYPO3-Console.git",
"reference": "8e497c03dee002fc175719e16191746b83c41400"
"reference": "5e4ce3c116685a9929e033d3032d502658e543e9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/8e497c03dee002fc175719e16191746b83c41400",
"reference": "8e497c03dee002fc175719e16191746b83c41400",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/5e4ce3c116685a9929e033d3032d502658e543e9",
"reference": "5e4ce3c116685a9929e033d3032d502658e543e9",
"shasum": ""
},
"require": {
"doctrine/annotations": "^1.4",
"helhum/config-loader": ">=0.9 <0.12",
"helhum/typo3-console-plugin": "^2.0.2",
"php": ">=7.0.0 <7.3",
"symfony/console": "^3.3.6 || ^4.0",
"symfony/process": "^3.3.6 || ^4.0",
"typo3/cms-backend": "^8.7.7 || ~9.0.0",
"typo3/cms-core": "^8.7.7 || ~9.0.0",
"typo3/cms-extbase": "^8.7.7 || ~9.0.0",
"typo3/cms-extensionmanager": "^8.7.7 || ~9.0.0",
"typo3/cms-fluid": "^8.7.7 || ~9.0.0",
"typo3/cms-install": "^8.7.7 || ~9.0.0",
"typo3/cms-saltedpasswords": "^8.7.7 || ~9.0.0",
"typo3/cms-scheduler": "^8.7.7 || ~9.0.0"
"symfony/console": "^3.4.4 || ^4.0",
"symfony/process": "^3.4.4 || ^4.0",
"typo3/cms-backend": "~8.7.10 || ~9.5.0",
"typo3/cms-core": "~8.7.10 || ~9.5.0",
"typo3/cms-extbase": "~8.7.10 || ~9.5.0",
"typo3/cms-extensionmanager": "~8.7.10 || ~9.5.0",
"typo3/cms-fluid": "~8.7.10 || ~9.5.0",
"typo3/cms-frontend": "~8.7.10 || ~9.5.0",
"typo3/cms-install": "~8.7.10 || ~9.5.0",
"typo3/cms-saltedpasswords": "*",
"typo3/cms-scheduler": "~8.7.10 || ~9.5.0"
},
"conflict": {
"friendsoftypo3/dbal": "*",
......@@ -1125,17 +1230,19 @@
},
"replace": {
"typo3-ter/typo3-console": "self.version",
"typo3/cms-cli": "*",
"typo3_console": "self.version"
},
"require-dev": {
"helhum/typo3-composer-setup": "^0.4",
"nimut/testing-framework": "3.*@dev",
"cweagans/composer-patches": "^1.6",
"doctrine/dbal": "< 2.8",
"jakub-onderka/php-parallel-lint": "^1.0",
"nimut/testing-framework": "dev-master",
"symfony/filesystem": "^3.2",
"typo3-console/create-reference-command": "^2.2",
"typo3-console/php-server-command": "^0.1.1",
"typo3/cms-filemetadata": "^8.7.7 || ~9.0.0 || 9.1.*@dev",
"typo3/cms-reports": "^8.7.7 || ~9.0.0 || 9.1.*@dev"
"typo3-console/convert-command-controller-command": "@dev",
"typo3-console/create-reference-command": "@dev",
"typo3-console/php-server-command": "^0.2",
"typo3/cms-filemetadata": "~8.7.10 || ~9.5.0 || dev-master",
"typo3/cms-reports": "~8.7.10 || ~9.5.0 || dev-master"
},
"bin": [
"typo3cms"
......@@ -1146,7 +1253,7 @@
"dev-master": "5.x-dev"
},
"typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"app-dir": ".Build",
"web-dir": ".Build/public",
"Package": {
"partOfMinimalUsableSystem": true
......@@ -1156,15 +1263,14 @@
"autoload": {
"psr-4": {
"Helhum\\Typo3Console\\": [
"Classes/",
"Compatibility/",
"Resources/Private/ExtensionArtifacts/src/"
"Classes/Console/",
"Classes/Compatibility/"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
"GPL-2.0-or-later"
],
"authors": [
{
......@@ -1183,7 +1289,7 @@
"console",
"typo3"
],
"time": "2018-01-10T12:46:32+00:00"
"time": "2018-10-21T21:10:17+00:00"
},
{
"name": "helhum/typo3-console-plugin",
......@@ -1238,18 +1344,75 @@
],
"time": "2017-12-13T13:52:52+00:00"
},
{
"name": "helhum/typo3-secure-web",
"version": "v0.2.7",
"source": {
"type": "git",
"url": "https://github.com/helhum/typo3-secure-web.git",
"reference": "79c916450a4c3ad19341fa6c8df5539a59179ad0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/helhum/typo3-secure-web/zipball/79c916450a4c3ad19341fa6c8df5539a59179ad0",
"reference": "79c916450a4c3ad19341fa6c8df5539a59179ad0",
"shasum": ""
},
"require": {
"helhum/typo3-composer-setup": "^0.5.0",
"typo3/cms-composer-installers": "^1.4 || ^2.0"
},
"conflict": {
"typo3/cms": "<8.7.8",
"typo3/cms-core": "<8.7.8"
},
"require-dev": {
"typo3-console/php-server-command": "^0.1.0",
"typo3/cms": "dev-TYPO3_8-7 as 8.7.8"
},
"type": "library",
"extra": {
"typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"root-dir": "typo3",
"web-dir": "public"
},
"helhum/typo3-console": {
"install-extension-dummy": "0"
}
},
"autoload": {
"psr-4": {
"Helhum\\Typo3SecureWeb\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"authors": [
{
"name": "Helmut Hummel",
"email": "info@helhum.io",
"homepage": "https://helhum.io",
"role": "Developer"
}
],
"description": "Set up secure TYPO3 web directory containing only public assets",
"time": "2017-12-31T14:48:15+00:00"
},
{
"name": "monolog/monolog",
"version": "1.23.0",
"version": "1.24.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
"reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
"reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
"reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
"shasum": ""
},
"require": {
......@@ -1314,7 +1477,7 @@
"logging",
"psr-3"
],
"time": "2017-06-19T01:22:40+00:00"
"time": "2018-11-05T09:00:11+00:00"
},
{
"name": "mso/idna-convert",
......@@ -1367,16 +1530,16 @@
},
{
"name": "nikic/php-parser",
"version": "v3.1.1",
"version": "v3.1.5",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "a1e8e1a30e1352f118feff1a8481066ddc2f234a"
"reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a1e8e1a30e1352f118feff1a8481066ddc2f234a",
"reference": "a1e8e1a30e1352f118feff1a8481066ddc2f234a",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
"reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
"shasum": ""
},
"require": {
......@@ -1414,7 +1577,7 @@
"parser",
"php"
],
"time": "2017-09-02T17:10:46+00:00"
"time": "2018-02-28T20:30:58+00:00"
},
{
"name": "psr/container",
......@@ -1618,16 +1781,16 @@
},
{
"name": "symfony/console",
"version": "v3.4.15",
"version": "v3.4.18",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73"
"reference": "1d228fb4602047d7b26a0554e0d3efd567da5803"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73",
"reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73",
"url": "https://api.github.com/repos/symfony/console/zipball/1d228fb4602047d7b26a0554e0d3efd567da5803",
"reference": "1d228fb4602047d7b26a0554e0d3efd567da5803",
"shasum": ""
},
"require": {
......@@ -1683,20 +1846,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2018-07-26T11:19:56+00:00"
"time": "2018-10-30T16:50:50+00:00"
},
{
"name": "symfony/debug",
"version": "v3.4.15",
"version": "v3.4.18",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "c4625e75341e4fb309ce0c049cbf7fb84b8897cd"
"reference": "fe9793af008b651c5441bdeab21ede8172dab097"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/c4625e75341e4fb309ce0c049cbf7fb84b8897cd",
"reference": "c4625e75341e4fb309ce0c049cbf7fb84b8897cd",
"url": "https://api.github.com/repos/symfony/debug/zipball/fe9793af008b651c5441bdeab21ede8172dab097",
"reference": "fe9793af008b651c5441bdeab21ede8172dab097",
"shasum": ""
},
"require": {
......@@ -1739,20 +1902,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2018-08-03T10:42:44+00:00"
"time": "2018-10-31T09:06:03+00:00"
},
{
"name": "symfony/dependency-injection",
"version": "v3.4.11",
"version": "v3.4.18",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "8a4672aca8db6d807905d695799ea7d83c8e5bba"
"reference": "9c98452ac7fff4b538956775630bc9701f5384ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8a4672aca8db6d807905d695799ea7d83c8e5bba",
"reference": "8a4672aca8db6d807905d695799ea7d83c8e5bba",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9c98452ac7fff4b538956775630bc9701f5384ba",
"reference": "9c98452ac7fff4b538956775630bc9701f5384ba",
"shasum": ""
},
"require": {
......@@ -1810,20 +1973,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"time": "2018-05-25T11:57:15+00:00"