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
......@@ -3,8 +3,11 @@
/commands/*/*.example
/commands/*/README.txt
/commands/host/launch
/commands/db/mysql
/homeadditions/*.example
/homeadditions/README.txt
/.gitignore
/import.yaml
/docker-compose.yaml
/db_snapshots
......
APIVersion: v1.11.2
APIVersion: v1.12.0
name: my.typo3.org
type: typo3
docroot: public
......@@ -25,11 +25,11 @@ use_dns_when_possible: true
timezone: Europe/Berlin
# This config.yaml was created with ddev version v1.11.2
# webimage: drud/ddev-webserver:v1.11.0
# dbimage: drud/ddev-dbserver:v1.11.0-10.2
# dbaimage: drud/phpmyadmin:v1.11.0
# bgsyncimage: drud/ddev-bgsync:v1.11.0
# This config.yaml was created with ddev version v1.12.0
# webimage: drud/ddev-webserver:v1.12.1
# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.12.0
# dbaimage: drud/phpmyadmin:v1.12.0
# bgsyncimage: drud/ddev-bgsync:v1.12.0
# However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev.
# You can update this config.yaml using 'ddev config'.
......@@ -54,11 +54,17 @@ timezone: Europe/Berlin
# dbaimage: <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_https_port: <port> # Port for https (defaults to 443)
# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
# Note that for most people the commands
# Note that for most people the commands
# "ddev exec enable_xdebug" and "ddev exec disable_xdebug" work better,
# as leaving xdebug enabled all the time is a big performance hit.
......@@ -66,7 +72,7 @@ timezone: Europe/Berlin
# timezone: Europe/Berlin
# This is the timezone used in the containers and by PHP;
# it can be set to any valid timezone,
# it can be set to any valid timezone,
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# For example Europe/Dublin or MST7MDT
......@@ -88,14 +94,14 @@ timezone: Europe/Berlin
# working_dir:
# web: /var/www/html
# db: /home
# would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.
# would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.
# omit_containers: ["dba", "ddev-ssh-agent"]
# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently
# only those two containers can be omitted here.
# Note that these containers can also be omitted globally in the
# Note that these containers can also be omitted globally in the
# ~/.ddev/global_config.yaml or with the "ddev config global" command.
# nfs_mount_enabled: false
......@@ -103,8 +109,8 @@ timezone: Europe/Berlin
# See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container
# webcache_enabled: false (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
# Was only for macOS, but now deprecated.
# See https://ddev.readthedocs.io/en/stable/users/performance/#webcache
# host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is
......@@ -135,8 +141,8 @@ timezone: Europe/Berlin
# Extra Debian packages that are needed in the dbimage can be added here
# use_dns_when_possible: true
# If the host has internet access and the domain configured can
# successfully be looked up, DNS will be used for hostname resolution
# If the host has internet access and the domain configured can
# successfully be looked up, DNS will be used for hostname resolution
# instead of editing /etc/hosts
# Defaults to true
......@@ -147,13 +153,13 @@ timezone: Europe/Berlin
# pre-v1.9 behavior.
# ngrok_args: --subdomain mysite --auth username:pass
# Provide extra flags to the "ngrok http" command, see
# Provide extra flags to the "ngrok http" command, see
# https://ngrok.com/docs#http or run "ngrok http -h"
# provider: default # Currently either "default" or "pantheon"
#
# Many ddev commands can be extended to run tasks before or after the
# ddev command is executed, for example "post-start", "post-import-db",
# Many ddev commands can be extended to run tasks before or after the
# ddev command is executed, for example "post-start", "post-import-db",
# "pre-composer", "post-composer"
# See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more
# information on the commands that can be extended and the tasks you can define
......
......@@ -6,6 +6,7 @@ master:
writable_mode: chmod
forward_agent: true
deploy_path: ~/ci
keep_releases: 2
develop:
stage: stage
hostname: my-stage-v9.typo3.org
......@@ -14,3 +15,4 @@ develop:
writable_mode: chmod
forward_agent: true
deploy_path: ~/ci/
keep_releases: 5
......@@ -93,42 +93,37 @@
},
{
"name": "causal/ig_ldap_sso_auth",
"version": "3.4.0",
"version": "3.5.0",
"source": {
"type": "git",
"url": "https://github.com/xperseguers/t3ext-ig_ldap_sso_auth.git",
"reference": "b7c3366553e526fd57489ac66d07a081add5aadc"
"reference": "c8fa56d86a2441fa21a76fe7526be93ccfc8a449"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/xperseguers/t3ext-ig_ldap_sso_auth/zipball/b7c3366553e526fd57489ac66d07a081add5aadc",
"reference": "b7c3366553e526fd57489ac66d07a081add5aadc",
"url": "https://api.github.com/repos/xperseguers/t3ext-ig_ldap_sso_auth/zipball/c8fa56d86a2441fa21a76fe7526be93ccfc8a449",
"reference": "c8fa56d86a2441fa21a76fe7526be93ccfc8a449",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-ldap": "*",
"php": ">= 7.2.0, <= 7.3.99",
"typo3/cms-core": "^8.7 || ^9.5"
"typo3/cms-core": "^8.7 || ^9.5 || ^10.1"
},
"replace": {
"ig_ldap_sso_auth": "self.version",
"typo3-ter/ig-ldap-sso-auth": "self.version"
},
"type": "typo3-cms-extension",
"extra": {
"branch-alias": {
"dev-master": "3.4.x-dev",
"dev-master": "3.5.x-dev",
"dev-3-3": "3.3.x-dev"
},
"typo3/cms": {
"extension-key": "ig_ldap_sso_auth",
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": ".Build/Web"
},
"typo3/class-alias-loader": {
"class-alias-maps": [
"Migrations/Code/ClassAliasMap.php"
]
}
},
"autoload": {
......@@ -157,7 +152,7 @@
"ldap",
"openldap"
],
"time": "2019-05-06T11:10:48+00:00"
"time": "2019-11-04T13:47:21+00:00"
},
{
"name": "cogpowered/finediff",
......@@ -280,16 +275,16 @@
},
{
"name": "doctrine/cache",
"version": "v1.8.1",
"version": "1.10.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "d4374ae95b36062d02ef310100ed33d78738d76c"
"reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/d4374ae95b36062d02ef310100ed33d78738d76c",
"reference": "d4374ae95b36062d02ef310100ed33d78738d76c",
"url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
"reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
"shasum": ""
},
"require": {
......@@ -300,7 +295,7 @@
},
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
"doctrine/coding-standard": "^4.0",
"doctrine/coding-standard": "^6.0",
"mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^7.0",
"predis/predis": "~1.0"
......@@ -311,7 +306,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.8.x-dev"
"dev-master": "1.9.x-dev"
}
},
"autoload": {
......@@ -345,13 +340,20 @@
"email": "schmittjoh@gmail.com"
}
],
"description": "Caching library offering an object-oriented API for many cache backends",
"homepage": "https://www.doctrine-project.org",
"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/projects/cache.html",
"keywords": [
"abstraction",
"apcu",
"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",
......@@ -447,16 +449,16 @@
},
{
"name": "doctrine/event-manager",
"version": "v1.0.0",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/event-manager.git",
"reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3"
"reference": "629572819973f13486371cb611386eb17851e85c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3",
"reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3",
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c",
"reference": "629572819973f13486371cb611386eb17851e85c",
"shasum": ""
},
"require": {
......@@ -466,7 +468,7 @@
"doctrine/common": "<2.9@dev"
},
"require-dev": {
"doctrine/coding-standard": "^4.0",
"doctrine/coding-standard": "^6.0",
"phpunit/phpunit": "^7.0"
},
"type": "library",
......@@ -485,6 +487,10 @@
"MIT"
],
"authors": [
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
......@@ -493,10 +499,6 @@
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
......@@ -510,27 +512,29 @@
"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",
"keywords": [
"event",
"eventdispatcher",
"eventmanager"
"event dispatcher",
"event manager",
"event system",
"events"
],
"time": "2018-06-11T11:59:03+00:00"
"time": "2019-11-10T09:48:07+00:00"
},
{
"name": "doctrine/instantiator",
"version": "1.2.0",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
"reference": "a2c590166b2133a4633738648b6b064edae0814a"
"reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
"reference": "a2c590166b2133a4633738648b6b064edae0814a",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
"reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
"shasum": ""
},
"require": {
......@@ -573,20 +577,20 @@
"constructor",
"instantiate"
],
"time": "2019-03-17T17:37:11+00:00"
"time": "2019-10-21T16:45:58+00:00"
},
{
"name": "doctrine/lexer",
"version": "1.1.0",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
"reference": "e17f069ede36f7534b95adec71910ed1b49c74ea"
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea",
"reference": "e17f069ede36f7534b95adec71910ed1b49c74ea",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"shasum": ""
},
"require": {
......@@ -600,7 +604,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev"
"dev-master": "1.2.x-dev"
}
},
"autoload": {
......@@ -635,7 +639,7 @@
"parser",
"php"
],
"time": "2019-07-30T19:33:28+00:00"
"time": "2019-10-30T14:39:59+00:00"
},
{
"name": "gordalina/cachetool",
......@@ -698,23 +702,23 @@
},
{
"name": "gridelementsteam/gridelements",
"version": "9.2.1",
"version": "9.3.0",
"source": {
"type": "git",
"url": "https://gitlab.com/coderscare/gridelements.git",
"reference": "f5799426d722e8a1907e777c49ce0e38f426fd02"
"reference": "06a7f541a30d985f7466d2b976eb0336848cff6e"
},
"dist": {
"type": "zip",
"url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=f5799426d722e8a1907e777c49ce0e38f426fd02",
"reference": "f5799426d722e8a1907e777c49ce0e38f426fd02",
"url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=06a7f541a30d985f7466d2b976eb0336848cff6e",
"reference": "06a7f541a30d985f7466d2b976eb0336848cff6e",
"shasum": ""
},
"require": {
"typo3/cms-backend": "^9.5.6",
"typo3/cms-core": "^9.5.6",
"typo3/cms-frontend": "^9.5.6",
"typo3/cms-recordlist": "^9.5.6"
"typo3/cms-backend": "^9.5.7",
"typo3/cms-core": "^9.5.7",
"typo3/cms-frontend": "^9.5.7",
"typo3/cms-recordlist": "^9.5.7"
},
"conflict": {
"jfmulticontent": "*",
......@@ -741,7 +745,7 @@
"TYPO3 CMS",
"grids"
],
"time": "2019-05-08T08:28:14+00:00"
"time": "2019-08-15T16:41:24+00:00"
},
{
"name": "guzzlehttp/guzzle",
......@@ -933,20 +937,20 @@
},
{
"name": "helhum/config-loader",
"version": "v0.11.0",
"version": "v0.12.2",
"source": {
"type": "git",
"url": "https://github.com/helhum/config-loader.git",
"reference": "7748b96a80725fd8801075a4b75485889ac04779"
"reference": "1faf12146c505f3b929b10f09aabb8b675d7842d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/helhum/config-loader/zipball/7748b96a80725fd8801075a4b75485889ac04779",
"reference": "7748b96a80725fd8801075a4b75485889ac04779",
"url": "https://api.github.com/repos/helhum/config-loader/zipball/1faf12146c505f3b929b10f09aabb8b675d7842d",
"reference": "1faf12146c505f3b929b10f09aabb8b675d7842d",
"shasum": ""
},
"require": {
"php": ">=7.0.0 <7.3.0"
"php": "^7"
},
"require-dev": {
"mikey179/vfsstream": "^1.6",
......@@ -973,7 +977,7 @@
"GPL-2.0-or-later"
],
"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",
......@@ -1032,54 +1036,52 @@
},
{
"name": "helhum/typo3-console",
"version": "5.6.0",
"version": "v5.7.2",
"source": {
"type": "git",
"url": "https://github.com/TYPO3-Console/TYPO3-Console.git",
"reference": "5e4ce3c116685a9929e033d3032d502658e543e9"
"reference": "2e6b9eb9910fc79d24b0ed6ce5317503669d9535"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/5e4ce3c116685a9929e033d3032d502658e543e9",
"reference": "5e4ce3c116685a9929e033d3032d502658e543e9",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/2e6b9eb9910fc79d24b0ed6ce5317503669d9535",
"reference": "2e6b9eb9910fc79d24b0ed6ce5317503669d9535",
"shasum": ""
},
"require": {
"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",
"php": ">=7.0.0 <7.3",
"php": "^7",
"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-backend": "~8.7.22 || ~9.5.8",
"typo3/cms-core": "~8.7.22 || ~9.5.8",
"typo3/cms-extbase": "~8.7.22 || ~9.5.8",
"typo3/cms-extensionmanager": "~8.7.22 || ~9.5.8",
"typo3/cms-fluid": "~8.7.22 || ~9.5.8",
"typo3/cms-frontend": "~8.7.22 || ~9.5.8",
"typo3/cms-install": "~8.7.22 || ~9.5.8",
"typo3/cms-saltedpasswords": "*",
"typo3/cms-scheduler": "~8.7.10 || ~9.5.0"
"typo3/cms-scheduler": "~8.7.22 || ~9.5.8"
},
"conflict": {
"friendsoftypo3/dbal": "*",
"typo3-ter/dbal": "*"
},
"replace": {
"typo3-ter/typo3-console": "self.version",
"typo3_console": "self.version"
"typo3-ter/typo3-console": "self.version"
},
"require-dev": {
"cweagans/composer-patches": "^1.6",
"doctrine/dbal": "< 2.8",
"jakub-onderka/php-parallel-lint": "^1.0",
"nimut/testing-framework": "dev-master",
"nimut/testing-framework": "dev-allow-php73",
"symfony/filesystem": "^3.2",
"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"
"typo3/cms-filemetadata": "~8.7.22 || ~9.5.8 || dev-master",
"typo3/cms-reports": "~8.7.22 || ~9.5.8 || dev-master"
},
"bin": [
"typo3cms"
......@@ -1091,10 +1093,7 @@
},
"typo3/cms": {
"app-dir": ".Build",
"web-dir": ".Build/public",
"Package": {
"partOfMinimalUsableSystem": true
}
"web-dir": ".Build/public"
}
},
"autoload": {
......@@ -1126,7 +1125,7 @@
"console",
"typo3"
],
"time": "2018-10-21T21:10:17+00:00"
"time": "2019-08-22T10:03:46+00:00"
},
{
"name": "helhum/typo3-console-plugin",
......@@ -1183,16 +1182,16 @@
},
{
"name": "helhum/typo3-secure-web",
"version": "v0.2.8",
"version": "v0.2.9",
"source": {
"type": "git",
"url": "https://github.com/helhum/typo3-secure-web.git",
"reference": "c3530fda74affbae6d5a09c62335d128a735c69c"
"reference": "da2c4c61199ee7b4c8b4a2a8c5f3d3d049eeb393"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/helhum/typo3-secure-web/zipball/c3530fda74affbae6d5a09c62335d128a735c69c",
"reference": "c3530fda74affbae6d5a09c62335d128a735c69c",
"url": "https://api.github.com/repos/helhum/typo3-secure-web/zipball/da2c4c61199ee7b4c8b4a2a8c5f3d3d049eeb393",
"reference": "da2c4c61199ee7b4c8b4a2a8c5f3d3d049eeb393",
"shasum": ""
},
"require": {
......@@ -1222,7 +1221,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
"GPL-2.0-or-later"
],
"authors": [
{
......@@ -1233,20 +1232,20 @@
}
],
"description": "Set up secure TYPO3 web directory containing only public assets",
"time": "2018-12-16T12:14:08+00:00"
"time": "2019-05-30T15:24:17+00:00"
},
{
"name": "in2code/femanager",
"version": "5.1.1",
"version": "5.2.0",
"source": {
"type": "git",
"url": "https://github.com/in2code-de/femanager.git",
"reference": "b084802c6bf603855651a0c622fe8ce4f557634a"
"reference": "df128bb67708cbcf2ee0f9892f42cdcec0fc9ab5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/in2code-de/femanager/zipball/b084802c6bf603855651a0c622fe8ce4f557634a",
"reference": "b084802c6bf603855651a0c622fe8ce4f557634a",
"url": "https://api.github.com/repos/in2code-de/femanager/zipball/df128bb67708cbcf2ee0f9892f42cdcec0fc9ab5",
"reference": "df128bb67708cbcf2ee0f9892f42cdcec0fc9ab5",
"shasum": ""
},
"require": {
......@@ -1304,7 +1303,7 @@
"sr_feuser_register",
"typo3"
],
"time": "2019-05-26T12:00:20+00:00"
"time": "2019-12-17T09:53:22+00:00"
},
{
"name": "in2code/userprofile",
......@@ -1424,16 +1423,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.2.5",
"version": "v4.3.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2"
"reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/b76bbc3c51f22c570648de48e8c2d941ed5e2cf2",
"reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
"reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
"shasum": ""
},
"require": {
......@@ -1441,7 +1440,7 @@
"php": ">=7.0"
},
"require-dev": {
"ircmaxell/php-yacc": "0.0.4",
"ircmaxell/php-yacc": "0.0.5",
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
},
"bin": [
......@@ -1450,7 +1449,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.2-dev"
"dev-master": "4.3-dev"
}
},
"autoload": {
......@@ -1472,7 +1471,7 @@
"parser",
"php"
],
"time": "2019-10-25T18:33:07+00:00"
"time": "2019-11-08T13:50:10+00:00"
},
{
"name": "psr/cache",
......@@ -1912,30 +1911,31 @@
},
{
"name": "symfony/cache",
"version": "v4.3.6",
"version": "v4.4.1",
"source": {
"type": "git",