Commit f65c8e85 authored by Boris Schauer's avatar Boris Schauer

Merge branch...

Merge branch 'task/use-secure-web-package-and-separate-folder-for-project-extensions' into 'develop'

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

See merge request t3o/ter!383
parents b0fe2bad babcddd5
Pipeline #5646 passed with stages
in 11 minutes and 23 seconds
...@@ -14,15 +14,15 @@ hooks: ...@@ -14,15 +14,15 @@ hooks:
post-start: post-start:
- exec: sudo apt-get update - exec: sudo apt-get update
- exec: sudo apt-get install php7.0-ldap -y - 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: composer install -d /var/www/html
- exec: npm --prefix typo3conf/ext/t3olayout/Build install - exec: npm --prefix ../private/typo3conf/ext/t3olayout/Build install
- exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build - exec: npm --prefix ../private/typo3conf/ext/t3olayout/Build run-script build
- exec: ../vendor/bin/typo3cms install:generatepackagestates - exec: ../vendor/bin/typo3cms install:generatepackagestates
- exec: ../vendor/bin/typo3cms install:extensionsetupifpossible - 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 # webimage: drud/ddev-webserver:v1.2.0
# dbimage: drud/ddev-dbserver:v1.2.0 # dbimage: drud/ddev-dbserver:v1.2.0
# dbaimage: drud/phpmyadmin:v1.2.0 # dbaimage: drud/phpmyadmin:v1.2.0
...@@ -80,4 +80,4 @@ hooks: ...@@ -80,4 +80,4 @@ hooks:
# for them. Example: # for them. Example:
#hooks: #hooks:
# post-start: # post-start:
# - exec: composer install -d /var/www/html # - exec: composer install -d /var/www/html
\ No newline at end of file
# Created by .ignore support plugin (hsz.mobi) # Created by .ignore support plugin (hsz.mobi)
.idea .idea
typo3_src
bin/*
!bin/scripts/
vendor vendor
html/fileadmin html
html/typo3temp private/fileadmin
html/uploads private/typo3
html/typo3 private/index.php
html/index.php private/typo3temp
html/.htaccess private/uploads
html/typo3conf/ext/* private/typo3conf/ext/
html/typo3conf/AdditionalConfiguration.php private/typo3conf/PackageStates.php
html/typo3conf/deprecation_* private/typo3conf/AdditionalConfiguration.php
html/typo3conf/ENABLE_INSTALL_TOOL private/typo3conf/*.log
html/typo3conf/PackageStates.php private/typo3conf/l10n/
!html/typo3conf/ext/ter*
data/etc/solr/server/solr/mycores/t3o/data
...@@ -71,7 +71,7 @@ layout: ...@@ -71,7 +71,7 @@ layout:
stage: layout stage: layout
image: node:latest image: node:latest
before_script: before_script:
- cd html/typo3conf/ext/t3olayout/Build - cd private/typo3conf/ext/t3olayout/Build
script: script:
- npm install - npm install
- npm run build - npm run build
......
{ {
"name": "t3o/ter", "name": "t3o/ter",
"description": "Website for TYPO3 Extension Repository", "description": "Website for TYPO3 Extension Repository",
"authors": [ "authors": [
{ {
"name": "t3o team", "name": "t3o team",
"email": "maintenance@typo3.org" "email": "maintenance@typo3.org"
} }
], ],
"support": { "support": {
"email": "maintenance@typo3.org", "email": "maintenance@typo3.org",
"issues": "https://git-t3o.typo3.org/t3o/ter/issues" "issues": "https://git-t3o.typo3.org/t3o/ter/issues"
},
"repositories": [
{
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git"
}, },
{ "repositories": [
"type": "vcs", {
"url": "https://git-t3o.typo3.org/t3o/gitlab_api.git" "type": "path",
} "url": "extensions/*"
], },
"require": { {
"php": ">=7.0", "type": "vcs",
"typo3/cms-core": "^8.7", "url": "https://git-t3o.typo3.org/t3o/t3olayout.git"
"helhum/typo3-console": "^5.0", },
"dmitryd/typo3-realurl": "^2.2", {
"apache-solr-for-typo3/solr": "^7.0", "type": "vcs",
"t3o/t3olayout": "^3.0", "url": "https://git-t3o.typo3.org/t3o/gitlab_api.git"
"nikic/php-parser": "^3.1", }
"gordalina/cachetool": "^3.2" ],
}, "require": {
"require-dev": { "php": ">=7.0",
"nimut/testing-framework": "^2.0" "typo3/cms-core": "^8.7",
}, "t3o/ter-layout": "@dev",
"config": { "t3o/ter-soap": "@dev",
"store-auths": false, "t3o/ter-frontend": "@dev",
"platform": { "helhum/typo3-console": "^5.0",
"php": "7.0.30" "dmitryd/typo3-realurl": "^2.2",
} "apache-solr-for-typo3/solr": "^7.0",
}, "t3o/t3olayout": "^3.0",
"extra": { "nikic/php-parser": "^3.1",
"typo3/cms": { "gordalina/cachetool": "^3.2",
"web-dir": "html", "helhum/typo3-secure-web": "^0.2.7"
"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"
}, },
"classmap": [ "require-dev": {
"html/typo3conf/ext/ter_fe2/Classes/", "nimut/testing-framework": "^2.0"
"html/typo3conf/ext/ter/" },
] "config": {
}, "store-auths": false,
"scripts": { "platform": {
"test:unit": [ "php": "7.0.30"
"./vendor/bin/phpunit -c .gitlab-ci/Tests/UnitTests.xml" }
] },
} "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 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "cfecbc0909fc8f9a5d9c2e0b156acde2", "content-hash": "212c077f0a1581aa3a56bc86368be53c",
"packages": [ "packages": [
{ {
"name": "adoy/fastcgi-client", "name": "adoy/fastcgi-client",
...@@ -227,22 +227,22 @@ ...@@ -227,22 +227,22 @@
}, },
{ {
"name": "dmitryd/typo3-realurl", "name": "dmitryd/typo3-realurl",
"version": "2.3.0", "version": "2.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/dmitryd/typo3-realurl.git", "url": "https://github.com/dmitryd/typo3-realurl.git",
"reference": "dbafbbae049f1dfa66c4510970a938f191fd10c1" "reference": "4492e57ddaeda062ef802e840ffb02bab24816f9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/dmitryd/typo3-realurl/zipball/dbafbbae049f1dfa66c4510970a938f191fd10c1", "url": "https://api.github.com/repos/dmitryd/typo3-realurl/zipball/4492e57ddaeda062ef802e840ffb02bab24816f9",
"reference": "dbafbbae049f1dfa66c4510970a938f191fd10c1", "reference": "4492e57ddaeda062ef802e840ffb02bab24816f9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-mbstring": "*", "ext-mbstring": "*",
"php": ">=5.4.0", "php": ">=5.4.0,<7.3.0",
"typo3/cms-core": ">=6.2.0,<8.7.999" "typo3/cms-core": ">=6.2.0,<9.0.0"
}, },
"conflict": { "conflict": {
"bednee/cooluri": ">0.0.1", "bednee/cooluri": ">0.0.1",
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
"cms", "cms",
"typo3" "typo3"
], ],
"time": "2017-10-05T00:00:00+00:00" "time": "2018-07-09T00:00:00+00:00"
}, },
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
...@@ -1090,34 +1090,139 @@ ...@@ -1090,34 +1090,139 @@
], ],
"time": "2017-03-20T17:10:46+00:00" "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", "name": "helhum/typo3-console",
"version": "5.0.3", "version": "5.6.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": "8e497c03dee002fc175719e16191746b83c41400" "reference": "5e4ce3c116685a9929e033d3032d502658e543e9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/8e497c03dee002fc175719e16191746b83c41400", "url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/5e4ce3c116685a9929e033d3032d502658e543e9",
"reference": "8e497c03dee002fc175719e16191746b83c41400", "reference": "5e4ce3c116685a9929e033d3032d502658e543e9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/annotations": "^1.4", "doctrine/annotations": "^1.4",
"helhum/config-loader": ">=0.9 <0.12",
"helhum/typo3-console-plugin": "^2.0.2", "helhum/typo3-console-plugin": "^2.0.2",
"php": ">=7.0.0 <7.3", "php": ">=7.0.0 <7.3",
"symfony/console": "^3.3.6 || ^4.0", "symfony/console": "^3.4.4 || ^4.0",
"symfony/process": "^3.3.6 || ^4.0", "symfony/process": "^3.4.4 || ^4.0",
"typo3/cms-backend": "^8.7.7 || ~9.0.0", "typo3/cms-backend": "~8.7.10 || ~9.5.0",
"typo3/cms-core": "^8.7.7 || ~9.0.0", "typo3/cms-core": "~8.7.10 || ~9.5.0",
"typo3/cms-extbase": "^8.7.7 || ~9.0.0", "typo3/cms-extbase": "~8.7.10 || ~9.5.0",
"typo3/cms-extensionmanager": "^8.7.7 || ~9.0.0", "typo3/cms-extensionmanager": "~8.7.10 || ~9.5.0",
"typo3/cms-fluid": "^8.7.7 || ~9.0.0", "typo3/cms-fluid": "~8.7.10 || ~9.5.0",
"typo3/cms-install": "^8.7.7 || ~9.0.0", "typo3/cms-frontend": "~8.7.10 || ~9.5.0",
"typo3/cms-saltedpasswords": "^8.7.7 || ~9.0.0", "typo3/cms-install": "~8.7.10 || ~9.5.0",
"typo3/cms-scheduler": "^8.7.7 || ~9.0.0" "typo3/cms-saltedpasswords": "*",
"typo3/cms-scheduler": "~8.7.10 || ~9.5.0"
}, },
"conflict": { "conflict": {
"friendsoftypo3/dbal": "*", "friendsoftypo3/dbal": "*",
...@@ -1125,17 +1230,19 @@ ...@@ -1125,17 +1230,19 @@
}, },
"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": {
"helhum/typo3-composer-setup": "^0.4", "cweagans/composer-patches": "^1.6",
"nimut/testing-framework": "3.*@dev", "doctrine/dbal": "< 2.8",
"jakub-onderka/php-parallel-lint": "^1.0",
"nimut/testing-framework": "dev-master",
"symfony/filesystem": "^3.2", "symfony/filesystem": "^3.2",
"typo3-console/create-reference-command": "^2.2", "typo3-console/convert-command-controller-command": "@dev",
"typo3-console/php-server-command": "^0.1.1", "typo3-console/create-reference-command": "@dev",
"typo3/cms-filemetadata": "^8.7.7 || ~9.0.0 || 9.1.*@dev", "typo3-console/php-server-command": "^0.2",
"typo3/cms-reports": "^8.7.7 || ~9.0.0 || 9.1.*@dev" "typo3/cms-filemetadata": "~8.7.10 || ~9.5.0 || dev-master",
"typo3/cms-reports": "~8.7.10 || ~9.5.0 || dev-master"
}, },
"bin": [ "bin": [
"typo3cms" "typo3cms"
...@@ -1146,7 +1253,7 @@ ...@@ -1146,7 +1253,7 @@
"dev-master": "5.x-dev" "dev-master": "5.x-dev"
}, },
"typo3/cms": { "typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms", "app-dir": ".Build",
"web-dir": ".Build/public", "web-dir": ".Build/public",
"Package": { "Package": {
"partOfMinimalUsableSystem": true "partOfMinimalUsableSystem": true
...@@ -1156,15 +1263,14 @@ ...@@ -1156,15 +1263,14 @@
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Helhum\\Typo3Console\\": [ "Helhum\\Typo3Console\\": [
"Classes/", "Classes/Console/",
"Compatibility/", "Classes/Compatibility/"
"Resources/Private/ExtensionArtifacts/src/"
] ]
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"GPL-2.0+" "GPL-2.0-or-later"
], ],
"authors": [ "authors": [
{ {
...@@ -1183,7 +1289,7 @@