Skip to content
GitLab
Commit fce7d97a authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into 267-provide-a-ldap-deletion-option

parents 7b7d692b bb3e080a
Show whitespace changes
Inline Side-by-side
.ddev/.gitignore
View file @ fce7d97a
...@@ -3,8 +3,11 @@ ...@@ -3,8 +3,11 @@
/commands/*/*.example /commands/*/*.example
/commands/*/README.txt /commands/*/README.txt
/commands/host/launch
/commands/db/mysql
/homeadditions/*.example /homeadditions/*.example
/homeadditions/README.txt /homeadditions/README.txt
/.gitignore
/import.yaml /import.yaml
/docker-compose.yaml /docker-compose.yaml
/db_snapshots /db_snapshots
......
.ddev/config.yaml
View file @ fce7d97a
APIVersion: v1.11.2 APIVersion: v1.12.0
name: my.typo3.org name: my.typo3.org
type: typo3 type: typo3
docroot: public docroot: public
...@@ -25,11 +25,11 @@ use_dns_when_possible: true ...@@ -25,11 +25,11 @@ use_dns_when_possible: true
timezone: Europe/Berlin timezone: Europe/Berlin
# This config.yaml was created with ddev version v1.11.2 # This config.yaml was created with ddev version v1.12.0
# webimage: drud/ddev-webserver:v1.11.0 # webimage: drud/ddev-webserver:v1.12.1
# dbimage: drud/ddev-dbserver:v1.11.0-10.2 # dbimage: drud/ddev-dbserver-mariadb-10.2:v1.12.0
# dbaimage: drud/phpmyadmin:v1.11.0 # dbaimage: drud/phpmyadmin:v1.12.0
# bgsyncimage: drud/ddev-bgsync:v1.11.0 # bgsyncimage: drud/ddev-bgsync:v1.12.0
# However we do not recommend explicitly wiring these images into the # However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev. # config.yaml as they may break future versions of ddev.
# You can update this config.yaml using 'ddev config'. # You can update this config.yaml using 'ddev config'.
...@@ -54,6 +54,12 @@ timezone: Europe/Berlin ...@@ -54,6 +54,12 @@ timezone: Europe/Berlin
# dbaimage: <docker_image> # dbaimage: <docker_image>
# bgsyncimage: <docker_image> # bgsyncimage: <docker_image>
# mariadb_version and mysql_version
# ddev can use many versions of mariadb and mysql
# However these directives are mutually exclusive
# mariadb_version: 10.2
# mysql_version: 8.0
# router_http_port: <port> # Port to be used for http (defaults to port 80) # router_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443) # router_https_port: <port> # Port for https (defaults to 443)
...@@ -104,7 +110,7 @@ timezone: Europe/Berlin ...@@ -104,7 +110,7 @@ timezone: Europe/Berlin
# webcache_enabled: false (deprecated) # webcache_enabled: false (deprecated)
# Was only for macOS, but now deprecated. # Was only for macOS, but now deprecated.
# See https://ddev.readthedocs.io/en/stable/users/performance/#using-webcache_enabled-to-cache-the-project-directory # See https://ddev.readthedocs.io/en/stable/users/performance/#webcache
# host_https_port: "59002" # host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is # The host port binding for https can be explicitly specified. It is
......
.gitlab-ci/deployer/servers.yml
View file @ fce7d97a
...@@ -6,6 +6,7 @@ master: ...@@ -6,6 +6,7 @@ master:
writable_mode: chmod writable_mode: chmod
forward_agent: true forward_agent: true
deploy_path: ~/ci deploy_path: ~/ci
keep_releases: 2
develop: develop:
stage: stage stage: stage
hostname: my-stage-v9.typo3.org hostname: my-stage-v9.typo3.org
...@@ -14,3 +15,4 @@ develop: ...@@ -14,3 +15,4 @@ develop:
writable_mode: chmod writable_mode: chmod
forward_agent: true forward_agent: true
deploy_path: ~/ci/ deploy_path: ~/ci/
keep_releases: 5
composer.lock
View file @ fce7d97a
...@@ -93,42 +93,37 @@ ...@@ -93,42 +93,37 @@
}, },
{ {
"name": "causal/ig_ldap_sso_auth", "name": "causal/ig_ldap_sso_auth",
"version": "3.4.0", "version": "3.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/xperseguers/t3ext-ig_ldap_sso_auth.git", "url": "https://github.com/xperseguers/t3ext-ig_ldap_sso_auth.git",
"reference": "b7c3366553e526fd57489ac66d07a081add5aadc" "reference": "c8fa56d86a2441fa21a76fe7526be93ccfc8a449"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/xperseguers/t3ext-ig_ldap_sso_auth/zipball/b7c3366553e526fd57489ac66d07a081add5aadc", "url": "https://api.github.com/repos/xperseguers/t3ext-ig_ldap_sso_auth/zipball/c8fa56d86a2441fa21a76fe7526be93ccfc8a449",
"reference": "b7c3366553e526fd57489ac66d07a081add5aadc", "reference": "c8fa56d86a2441fa21a76fe7526be93ccfc8a449",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"ext-ldap": "*", "ext-ldap": "*",
"php": ">= 7.2.0, <= 7.3.99", "php": ">= 7.2.0, <= 7.3.99",
"typo3/cms-core": "^8.7 || ^9.5" "typo3/cms-core": "^8.7 || ^9.5 || ^10.1"
}, },
"replace": { "replace": {
"ig_ldap_sso_auth": "self.version",
"typo3-ter/ig-ldap-sso-auth": "self.version" "typo3-ter/ig-ldap-sso-auth": "self.version"
}, },
"type": "typo3-cms-extension", "type": "typo3-cms-extension",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.4.x-dev", "dev-master": "3.5.x-dev",
"dev-3-3": "3.3.x-dev" "dev-3-3": "3.3.x-dev"
}, },
"typo3/cms": { "typo3/cms": {
"extension-key": "ig_ldap_sso_auth",
"cms-package-dir": "{$vendor-dir}/typo3/cms", "cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": ".Build/Web" "web-dir": ".Build/Web"
},
"typo3/class-alias-loader": {
"class-alias-maps": [
"Migrations/Code/ClassAliasMap.php"
]
} }
}, },
"autoload": { "autoload": {
...@@ -157,7 +152,7 @@ ...@@ -157,7 +152,7 @@
"ldap", "ldap",
"openldap" "openldap"
], ],
"time": "2019-05-06T11:10:48+00:00" "time": "2019-11-04T13:47:21+00:00"
}, },
{ {
"name": "cogpowered/finediff", "name": "cogpowered/finediff",
...@@ -280,16 +275,16 @@ ...@@ -280,16 +275,16 @@
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
"version": "v1.8.1", "version": "1.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/cache.git", "url": "https://github.com/doctrine/cache.git",
"reference": "d4374ae95b36062d02ef310100ed33d78738d76c" "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/d4374ae95b36062d02ef310100ed33d78738d76c", "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
"reference": "d4374ae95b36062d02ef310100ed33d78738d76c", "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -300,7 +295,7 @@ ...@@ -300,7 +295,7 @@
}, },
"require-dev": { "require-dev": {
"alcaeus/mongo-php-adapter": "^1.1", "alcaeus/mongo-php-adapter": "^1.1",
"doctrine/coding-standard": "^4.0", "doctrine/coding-standard": "^6.0",
"mongodb/mongodb": "^1.1", "mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^7.0", "phpunit/phpunit": "^7.0",
"predis/predis": "~1.0" "predis/predis": "~1.0"
...@@ -311,7 +306,7 @@ ...@@ -311,7 +306,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.8.x-dev" "dev-master": "1.9.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -345,13 +340,20 @@ ...@@ -345,13 +340,20 @@
"email": "schmittjoh@gmail.com" "email": "schmittjoh@gmail.com"
} }
], ],
"description": "Caching library offering an object-oriented API for many cache backends", "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
"homepage": "https://www.doctrine-project.org", "homepage": "https://www.doctrine-project.org/projects/cache.html",
"keywords": [ "keywords": [
"abstraction",
"apcu",
"cache", "cache",
"caching" "caching",
"couchdb",
"memcached",
"php",
"redis",
"xcache"
], ],
"time": "2019-10-28T09:31:32+00:00" "time": "2019-11-29T15:36:20+00:00"
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
...@@ -447,16 +449,16 @@ ...@@ -447,16 +449,16 @@
}, },
{ {
"name": "doctrine/event-manager", "name": "doctrine/event-manager",
"version": "v1.0.0", "version": "1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/event-manager.git", "url": "https://github.com/doctrine/event-manager.git",
"reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3" "reference": "629572819973f13486371cb611386eb17851e85c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3", "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c",
"reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3", "reference": "629572819973f13486371cb611386eb17851e85c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -466,7 +468,7 @@ ...@@ -466,7 +468,7 @@
"doctrine/common": "<2.9@dev" "doctrine/common": "<2.9@dev"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^4.0", "doctrine/coding-standard": "^6.0",
"phpunit/phpunit": "^7.0" "phpunit/phpunit": "^7.0"
}, },
"type": "library", "type": "library",
...@@ -485,6 +487,10 @@ ...@@ -485,6 +487,10 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{ {
"name": "Roman Borschel", "name": "Roman Borschel",
"email": "roman@code-factory.org" "email": "roman@code-factory.org"
...@@ -493,10 +499,6 @@ ...@@ -493,10 +499,6 @@
"name": "Benjamin Eberlei", "name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de" "email": "kontakt@beberlei.de"
}, },
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{ {
"name": "Jonathan Wage", "name": "Jonathan Wage",
"email": "jonwage@gmail.com" "email": "jonwage@gmail.com"
...@@ -510,27 +512,29 @@ ...@@ -510,27 +512,29 @@
"email": "ocramius@gmail.com" "email": "ocramius@gmail.com"
} }
], ],
"description": "Doctrine Event Manager component", "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.",
"homepage": "https://www.doctrine-project.org/projects/event-manager.html", "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
"keywords": [ "keywords": [
"event", "event",
"eventdispatcher", "event dispatcher",
"eventmanager" "event manager",
"event system",
"events"
], ],
"time": "2018-06-11T11:59:03+00:00" "time": "2019-11-10T09:48:07+00:00"
}, },
{ {
"name": "doctrine/instantiator", "name": "doctrine/instantiator",
"version": "1.2.0", "version": "1.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/instantiator.git", "url": "https://github.com/doctrine/instantiator.git",
"reference": "a2c590166b2133a4633738648b6b064edae0814a" "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a", "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
"reference": "a2c590166b2133a4633738648b6b064edae0814a", "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -573,20 +577,20 @@ ...@@ -573,20 +577,20 @@
"constructor", "constructor",
"instantiate" "instantiate"
], ],
"time": "2019-03-17T17:37:11+00:00" "time": "2019-10-21T16:45:58+00:00"
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
"version": "1.1.0", "version": "1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/lexer.git", "url": "https://github.com/doctrine/lexer.git",
"reference": "e17f069ede36f7534b95adec71910ed1b49c74ea" "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea", "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"reference": "e17f069ede36f7534b95adec71910ed1b49c74ea", "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -600,7 +604,7 @@ ...@@ -600,7 +604,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.1.x-dev" "dev-master": "1.2.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -635,7 +639,7 @@ ...@@ -635,7 +639,7 @@
"parser", "parser",
"php" "php"
], ],
"time": "2019-07-30T19:33:28+00:00" "time": "2019-10-30T14:39:59+00:00"
}, },
{ {
"name": "gordalina/cachetool", "name": "gordalina/cachetool",
...@@ -698,23 +702,23 @@ ...@@ -698,23 +702,23 @@
}, },
{ {
"name": "gridelementsteam/gridelements", "name": "gridelementsteam/gridelements",
"version": "9.2.1", "version": "9.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://gitlab.com/coderscare/gridelements.git", "url": "https://gitlab.com/coderscare/gridelements.git",
"reference": "f5799426d722e8a1907e777c49ce0e38f426fd02" "reference": "06a7f541a30d985f7466d2b976eb0336848cff6e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=f5799426d722e8a1907e777c49ce0e38f426fd02", "url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=06a7f541a30d985f7466d2b976eb0336848cff6e",
"reference": "f5799426d722e8a1907e777c49ce0e38f426fd02", "reference": "06a7f541a30d985f7466d2b976eb0336848cff6e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"typo3/cms-backend": "^9.5.6", "typo3/cms-backend": "^9.5.7",
"typo3/cms-core": "^9.5.6", "typo3/cms-core": "^9.5.7",
"typo3/cms-frontend": "^9.5.6", "typo3/cms-frontend": "^9.5.7",
"typo3/cms-recordlist": "^9.5.6" "typo3/cms-recordlist": "^9.5.7"
}, },
"conflict": { "conflict": {
"jfmulticontent": "*", "jfmulticontent": "*",
...@@ -741,7 +745,7 @@ ...@@ -741,7 +745,7 @@
"TYPO3 CMS", "TYPO3 CMS",
"grids" "grids"
], ],
"time": "2019-05-08T08:28:14+00:00" "time": "2019-08-15T16:41:24+00:00"
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
...@@ -933,20 +937,20 @@ ...@@ -933,20 +937,20 @@
}, },
{ {
"name": "helhum/config-loader", "name": "helhum/config-loader",
"version": "v0.11.0", "version": "v0.12.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/helhum/config-loader.git", "url": "https://github.com/helhum/config-loader.git",
"reference": "7748b96a80725fd8801075a4b75485889ac04779" "reference": "1faf12146c505f3b929b10f09aabb8b675d7842d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/helhum/config-loader/zipball/7748b96a80725fd8801075a4b75485889ac04779", "url": "https://api.github.com/repos/helhum/config-loader/zipball/1faf12146c505f3b929b10f09aabb8b675d7842d",
"reference": "7748b96a80725fd8801075a4b75485889ac04779", "reference": "1faf12146c505f3b929b10f09aabb8b675d7842d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.0.0 <7.3.0" "php": "^7"
}, },
"require-dev": { "require-dev": {
"mikey179/vfsstream": "^1.6", "mikey179/vfsstream": "^1.6",
...@@ -973,7 +977,7 @@ ...@@ -973,7 +977,7 @@
"GPL-2.0-or-later" "GPL-2.0-or-later"
], ],
"description": "Generic config loader with context and environment support.", "description": "Generic config loader with context and environment support.",
"time": "2018-09-02T15:46:19+00:00" "time": "2019-05-30T14:58:15+00:00"
}, },
{ {
"name": "helhum/typo3-composer-setup", "name": "helhum/typo3-composer-setup",
...@@ -1032,54 +1036,52 @@ ...@@ -1032,54 +1036,52 @@
}, },
{ {
"name": "helhum/typo3-console", "name": "helhum/typo3-console",
"version": "5.6.0", "version": "v5.7.2",
"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": "5e4ce3c116685a9929e033d3032d502658e543e9" "reference": "2e6b9eb9910fc79d24b0ed6ce5317503669d9535"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/5e4ce3c116685a9929e033d3032d502658e543e9", "url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/2e6b9eb9910fc79d24b0ed6ce5317503669d9535",
"reference": "5e4ce3c116685a9929e033d3032d502658e543e9", "reference": "2e6b9eb9910fc79d24b0ed6ce5317503669d9535",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/annotations": "^1.4", "doctrine/annotations": "^1.4",
"helhum/config-loader": ">=0.9 <0.12", "helhum/config-loader": ">=0.9 <0.13",
"helhum/typo3-console-plugin": "^2.0.2", "helhum/typo3-console-plugin": "^2.0.2",
"php": ">=7.0.0 <7.3", "php": "^7",
"symfony/console": "^3.4.4 || ^4.0", "symfony/console": "^3.4.4 || ^4.0",
"symfony/process": "^3.4.4 || ^4.0", "symfony/process": "^3.4.4 || ^4.0",
"typo3/cms-backend": "~8.7.10 || ~9.5.0", "typo3/cms-backend": "~8.7.22 || ~9.5.8",
"typo3/cms-core": "~8.7.10 || ~9.5.0", "typo3/cms-core": "~8.7.22 || ~9.5.8",
"typo3/cms-extbase": "~8.7.10 || ~9.5.0", "typo3/cms-extbase": "~8.7.22 || ~9.5.8",
"typo3/cms-extensionmanager": "~8.7.10 || ~9.5.0", "typo3/cms-extensionmanager": "~8.7.22 || ~9.5.8",
"typo3/cms-fluid": "~8.7.10 || ~9.5.0", "typo3/cms-fluid": "~8.7.22 || ~9.5.8",
"typo3/cms-frontend": "~8.7.10 || ~9.5.0", "typo3/cms-frontend": "~8.7.22 || ~9.5.8",
"typo3/cms-install": "~8.7.10 || ~9.5.0", "typo3/cms-install": "~8.7.22 || ~9.5.8",
"typo3/cms-saltedpasswords": "*", "typo3/cms-saltedpasswords": "*",
"typo3/cms-scheduler": "~8.7.10 || ~9.5.0" "typo3/cms-scheduler": "~8.7.22 || ~9.5.8"
}, },
"conflict": { "conflict": {
"friendsoftypo3/dbal": "*", "friendsoftypo3/dbal": "*",
"typo3-ter/dbal": "*" "typo3-ter/dbal": "*"
}, },
"replace": { "replace": {
"typo3-ter/typo3-console": "self.version", "typo3-ter/typo3-console": "self.version"
"typo3_console": "self.version"
}, },
"require-dev": { "require-dev": {
"cweagans/composer-patches": "^1.6", "cweagans/composer-patches": "^1.6",
"doctrine/dbal": "< 2.8",
"jakub-onderka/php-parallel-lint": "^1.0", "jakub-onderka/php-parallel-lint": "^1.0",
"nimut/testing-framework": "dev-master", "nimut/testing-framework": "dev-allow-php73",
"symfony/filesystem": "^3.2", "symfony/filesystem": "^3.2",
"typo3-console/convert-command-controller-command": "@dev", "typo3-console/convert-command-controller-command": "@dev",
"typo3-console/create-reference-command": "@dev", "typo3-console/create-reference-command": "@dev",
"typo3-console/php-server-command": "^0.2", "typo3-console/php-server-command": "^0.2",
"typo3/cms-filemetadata": "~8.7.10 || ~9.5.0 || dev-master", "typo3/cms-filemetadata": "~8.7.22 || ~9.5.8 || dev-master",
"typo3/cms-reports": "~8.7.10 || ~9.5.0 || dev-master" "typo3/cms-reports": "~8.7.22 || ~9.5.8 || dev-master"
}, },
"bin": [ "bin": [
"typo3cms" "typo3cms"
...@@ -1091,10 +1093,7 @@ ...@@ -1091,10 +1093,7 @@
},