Commit 47a89dc9 authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'develop' into 'main'

Release 25-02-2021

See merge request !645
parents 6910d397 6d0a744b
Pipeline #10419 passed with stages
in 10 minutes and 12 seconds
......@@ -5,9 +5,8 @@
/**/*.example
/.dbimageBuild
/.dbimageExtra
/.ddev-docker-compose-base.yaml
/.ddev-docker-compose-full.yaml
/.ddevlive-downloads
/.ddev-docker-*.yaml
/.*downloads
/.global_commands
/.homeadditions
/.sshimageBuild
......
......@@ -3,9 +3,9 @@ version: '3.6'
services:
solr:
container_name: ddev-${DDEV_SITENAME}-solr
image: typo3solr/ext-solr:10.0.1
image: typo3solr/ext-solr:11.0.3
restart: "no"
ports:
expose:
- 8983
labels:
com.ddev.site-name: ${DDEV_SITENAME}
......@@ -17,4 +17,4 @@ services:
- "./solr:/opt/solr/server/solr"
web:
links:
- solr:$DDEV_HOSTNAME
- solr
......@@ -68,6 +68,7 @@ test:mutation:
- composer selfupdate --2
- composer install --ignore-platform-reqs
- ./vendor/bin/infection --min-msi=10 --min-covered-msi=75 --threads=4
retry: 2
artifacts:
when: always
paths:
......
......@@ -17,16 +17,8 @@
"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"
},
{
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/test-helpers.git"
"type": "composer",
"url": "https://gitlab.typo3.org/api/v4/group/560/-/packages/composer/"
}
],
"require": {
......@@ -62,7 +54,7 @@
"punktde/codeception-database": "^2.0",
"punktde/codeception-filesystem": "^2.0",
"punktde/codeception-webdriver": "^2.2",
"t3o/test-helpers": "dev-master"
"t3o/test-helpers": "dev-main"
},
"config": {
"store-auths": false,
......
......@@ -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": "356e3d497937205d3441692e693e5d70",
"content-hash": "f7ce590941a2ef22be02d9d31b79c3cb",
"packages": [
{
"name": "adoy/fastcgi-client",
......@@ -372,16 +372,16 @@
},
{
"name": "doctrine/annotations",
"version": "1.11.1",
"version": "1.12.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
"reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad"
"reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
"reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b",
"reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b",
"shasum": ""
},
"require": {
......@@ -396,11 +396,6 @@
"phpunit/phpunit": "^7.5 || ^9.1.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11.x-dev"
}
},
"autoload": {
"psr-4": {
"Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
......@@ -441,9 +436,9 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
"source": "https://github.com/doctrine/annotations/tree/1.11.1"
"source": "https://github.com/doctrine/annotations/tree/1.12.1"
},
"time": "2020-10-26T10:28:16+00:00"
"time": "2021-02-21T21:00:45+00:00"
},
{
"name": "doctrine/cache",
......@@ -1611,16 +1606,16 @@
},
{
"name": "jean85/pretty-package-versions",
"version": "2.0.2",
"version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/Jean85/pretty-package-versions.git",
"reference": "2053f8d459033782d5fa4948c6c0b2d1e7de21e6"
"reference": "b2c4ec2033a0196317a467cb197c7c843b794ddf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/2053f8d459033782d5fa4948c6c0b2d1e7de21e6",
"reference": "2053f8d459033782d5fa4948c6c0b2d1e7de21e6",
"url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/b2c4ec2033a0196317a467cb197c7c843b794ddf",
"reference": "b2c4ec2033a0196317a467cb197c7c843b794ddf",
"shasum": ""
},
"require": {
......@@ -1664,9 +1659,9 @@
],
"support": {
"issues": "https://github.com/Jean85/pretty-package-versions/issues",
"source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.2"
"source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.3"
},
"time": "2021-02-03T09:41:45+00:00"
"time": "2021-02-22T10:52:38+00:00"
},
{
"name": "lcobucci/jwt",
......@@ -7419,11 +7414,12 @@
},
{
"name": "t3o/gitlab_api",
"version": "1.2.1",
"source": {
"type": "git",
"url": "https://git-t3o.typo3.org/t3o/gitlab_api.git",
"reference": "f329bc05cf52a8aaa8d8416ab89c14b34c1595cd"
"version": "1.2.2",
"dist": {
"type": "zip",
"url": "https://gitlab.typo3.org/api/v4/projects/50/packages/composer/archives/t3o/gitlab_api.zip?sha=cafcff320d10b0201584a03500bb69a088ee443e",
"reference": "cafcff320d10b0201584a03500bb69a088ee443e",
"shasum": ""
},
"replace": {
"gitlab_api": "self.version",
......@@ -7437,16 +7433,16 @@
},
"keywords": [
"TYPO3 CMS"
],
"time": "2020-07-15T10:23:53+00:00"
]
},
{
"name": "t3o/t3olayout",
"version": "5.1.3",
"source": {
"type": "git",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git",
"reference": "3d02b002f923f6e0d0f981947052ec2aad048894"
"version": "5.1.5",
"dist": {
"type": "zip",
"url": "https://gitlab.typo3.org/api/v4/projects/8/packages/composer/archives/t3o/t3olayout.zip?sha=54c16a6648e57f936a6ff3f74e064640832299fc",
"reference": "54c16a6648e57f936a6ff3f74e064640832299fc",
"shasum": ""
},
"require": {
"causal/ig_ldap_sso_auth": "^3.5",
......@@ -7495,8 +7491,7 @@
"homepage": "https://typo3.org",
"keywords": [
"TYPO3 CMS"
],
"time": "2021-02-15T18:51:03+00:00"
]
},
{
"name": "t3o/ter-frontend",
......@@ -10556,6 +10551,79 @@
},
"time": "2019-08-10T16:20:53+00:00"
},
{
"name": "composer/package-versions-deprecated",
"version": "1.11.99.1",
"source": {
"type": "git",
"url": "https://github.com/composer/package-versions-deprecated.git",
"reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/7413f0b55a051e89485c5cb9f765fe24bb02a7b6",
"reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.1.0 || ^2.0",
"php": "^7 || ^8"
},
"replace": {
"ocramius/package-versions": "1.11.99"
},
"require-dev": {
"composer/composer": "^1.9.3 || ^2.0@dev",
"ext-zip": "^1.13",
"phpunit/phpunit": "^6.5 || ^7"
},
"type": "composer-plugin",
"extra": {
"class": "PackageVersions\\Installer",
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"PackageVersions\\": "src/PackageVersions"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Marco Pivetta",
"email": "ocramius@gmail.com"
},
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be"
}
],
"description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
"support": {
"issues": "https://github.com/composer/package-versions-deprecated/issues",
"source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.1"
},
"funding": [
{
"url": "https://packagist.com",
"type": "custom"
},
{
"url": "https://github.com/composer",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/composer/composer",
"type": "tidelift"
}
],
"time": "2020-11-11T10:22:58+00:00"
},
{
"name": "composer/semver",
"version": "3.2.4",
......@@ -11302,68 +11370,6 @@
},
"time": "2020-07-06T19:22:08+00:00"
},
{
"name": "ocramius/package-versions",
"version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/Ocramius/PackageVersions.git",
"reference": "a7e35c34bc166a5684a1e2f13da7b1d6a821349d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/a7e35c34bc166a5684a1e2f13da7b1d6a821349d",
"reference": "a7e35c34bc166a5684a1e2f13da7b1d6a821349d",
"shasum": ""
},
"require": {
"composer-runtime-api": "^2.0.0",
"php": "^7.4.7 || ~8.0.0"
},
"replace": {
"composer/package-versions-deprecated": "*"
},
"require-dev": {
"composer/composer": "^2.0.0@dev",
"doctrine/coding-standard": "^8.1.0",
"ext-zip": "^1.15.0",
"infection/infection": "dev-master#8d6c4d6b15ec58d3190a78b7774a5d604ec1075a",
"phpunit/phpunit": "~9.3.11",
"vimeo/psalm": "^4.0.1"
},
"type": "library",
"autoload": {
"psr-4": {
"PackageVersions\\": "src/PackageVersions"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Marco Pivetta",
"email": "ocramius@gmail.com"
}
],
"description": "Provides efficient querying for installed package versions (no runtime IO)",
"support": {
"issues": "https://github.com/Ocramius/PackageVersions/issues",
"source": "https://github.com/Ocramius/PackageVersions/tree/2.1.0"
},
"funding": [
{
"url": "https://github.com/Ocramius",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/ocramius/package-versions",
"type": "tidelift"
}
],
"time": "2020-10-21T13:48:04+00:00"
},
{
"name": "ondram/ci-detector",
"version": "3.5.1",
......@@ -12176,16 +12182,16 @@
},
{
"name": "t3o/test-helpers",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://git-t3o.typo3.org/t3o/test-helpers.git",
"reference": "32b5f984a5c0675e011dce38e1e6e5edd3805f20"
"version": "dev-main",
"dist": {
"type": "zip",
"url": "https://gitlab.typo3.org/api/v4/projects/71/packages/composer/archives/t3o/test-helpers.zip?sha=dfdf3f842dfd9780f2e17fc28345f80d13eb2671",
"reference": "dfdf3f842dfd9780f2e17fc28345f80d13eb2671",
"shasum": ""
},
"require-dev": {
"codeception/codeception": "*"
},
"default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
......@@ -12195,8 +12201,7 @@
"license": [
"GPL-3.0-or-later"
],
"description": "This package provides gherkin steps and module definitions to use for t3o testing",
"time": "2019-11-05T17:45:40+00:00"
"description": "This package provides gherkin steps and module definitions to use for t3o testing"
},
{
"name": "thecodingmachine/safe",
......
......@@ -83,7 +83,7 @@
</f:if>
<div class="form-group row">
<div class="col-md-8">
<label for="tokenPassword">Your password</label>
<label for="tokenPassword">Your typo3.org password</label>
<f:form.textfield type="password" class="form-control" id="tokenPassword" property="password" value="" required="true" />
</div>
</div>
......
......@@ -15,7 +15,7 @@
</div>
<div class="form-group row">
<div class="col-md-8">
<label for="tokenPassword">Your password</label>
<label for="tokenPassword">Your typo3.org password</label>
<f:form.textfield type="password" class="form-control" id="tokenPassword" property="password" value="" required="true" />
</div>
</div>
......@@ -24,4 +24,4 @@
<f:form.submit class="btn btn-primary mb-0 mt-0" value="Refresh access token" />
</div>
</div>
</f:form>
\ No newline at end of file
</f:form>
......@@ -15,7 +15,7 @@
</div>
<div class="form-group row">
<div class="col-md-8">
<label for="tokenPassword">Your password</label>
<label for="tokenPassword">Your typo3.org password</label>
<f:form.textfield type="password" class="form-control" id="tokenPassword" property="password" value="" required="true" />
</div>
</div>
......@@ -24,4 +24,4 @@
<f:form.submit class="btn btn-primary mb-0 mt-0" value="Revoke access token" />
</div>
</div>
</f:form>
\ No newline at end of file
</f:form>
routeEnhancers:
PageTypeSuffix:
type: PageType
default: /
index: ''
map:
/: 0
sitemap.xml: 1533906435
Markdown is supported
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