Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

12 LTS #323

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
4b80c89
v12 compatibility
Jan 18, 2023
92a9b13
v12 compatibility
Jan 18, 2023
e6c2f98
v12 compatibility
Jan 18, 2023
2af910f
v12 compatibility
Jan 18, 2023
4a97274
Merge branch '12-svewap' into dev/12lts
jonaseberle Nov 3, 2023
6424878
task: only support T3 v12
jonaseberle Nov 3, 2023
59f8136
task: refactor hardwired translations
jonaseberle Nov 3, 2023
9767d8e
task: re-add </html>
jonaseberle Nov 3, 2023
45e7a22
task: fix typo
jonaseberle Nov 3, 2023
841dc89
task: document extbase.controllerExtensionName misery
jonaseberle Nov 3, 2023
15c2933
task: render trackingObjects.‹tracking-object-key›.inject (cObj)
jonaseberle Nov 3, 2023
61bc6b0
task: update dependencies (composer)
jonaseberle Nov 3, 2023
d5edb78
task: add additional.php because DDEV does not create it on first run
jonaseberle Nov 3, 2023
8742d94
task: upgrade DDEV config
jonaseberle Nov 3, 2023
8f0967f
task: update .gitattributes and .gitignore
jonaseberle Nov 3, 2023
5ecc068
task: use insertData to inject paths
jonaseberle Nov 3, 2023
b1093f7
task: ignore auto-generated config file (cgl)
jonaseberle Nov 3, 2023
cd7b5f8
task: adjust PHP versions (CI)
jonaseberle Nov 3, 2023
957e434
fix: fix customTheme test fixture
jonaseberle Nov 3, 2023
2991422
task: remove bootstrap_package workaround
jonaseberle Nov 9, 2023
4bb1978
fix: fix acceptance tests for custom theme
jonaseberle Nov 9, 2023
a7583f8
task: adjust PHP versions for unit-tests-lowest & coveralls
jonaseberle Nov 9, 2023
500cb86
task: refactor translations for themes
jonaseberle Nov 9, 2023
b31a973
task: update unit tests
jonaseberle Nov 9, 2023
1ea2ffe
task: try to harden acceptance tests
jonaseberle Nov 9, 2023
efbcc53
task: Use `path` getText for local paths (TypoScript)
jonaseberle Jan 22, 2024
9586422
chore(browsers)!: drop IE11 support
jonaseberle Jan 22, 2024
23933d6
fix(i18n): use T3v12.4.9+ for _LOCAL_LANG
jonaseberle Jan 22, 2024
4498b74
docs: add path: getText shortcomings
jonaseberle Jan 30, 2024
b8defdf
task(templates): use btn-groups
jonaseberle Feb 6, 2024
ff8ae73
task(composer): raise PHP requirement
jonaseberle Feb 6, 2024
636422b
task(DDEV): set defaults for local dev
jonaseberle Feb 6, 2024
f874227
chore(tests): update Selenium, codeception and web driver
jonaseberle Feb 6, 2024
20263ff
chore(DDEV): update config
jonaseberle Feb 6, 2024
d4c7317
chore(tests): update unit tests, drop phpunit coverage
jonaseberle Feb 6, 2024
8c28696
chore(cgl): update php-cs, lint
jonaseberle Feb 6, 2024
de235ef
chore(tests): help Firefox with clicking buttons...
jonaseberle Feb 6, 2024
923bf1f
chore(tests): cover PHP 8.3
jonaseberle Feb 6, 2024
9931d21
chore(nodejs): upgrade build
jonaseberle Feb 6, 2024
ca8d86b
chore(DDEV): use .ddev.site
jonaseberle Mar 4, 2024
63722e9
feat(TrackingObjects): added Google Ads, updated Analytics+Tag Manager
jonaseberle Mar 4, 2024
355534d
feat(TrackingObjects): add translations
jonaseberle Mar 4, 2024
c3667d0
chore(comments): update eTracker
jonaseberle Mar 4, 2024
d2f014c
task(examples): add GoogleAds to example configuration
jonaseberle Mar 4, 2024
cbaaefd
docs: streamline part about data-attributes
jonaseberle Mar 6, 2024
adf188b
feat: allow opening via click on any [data-cookieman-show]
jonaseberle Mar 6, 2024
6bb021e
chore(tests): refactor acceptance tests
jonaseberle Mar 6, 2024
13a4160
fix: add missing .min.js for [data-cookieman-show]
jonaseberle Mar 6, 2024
cc9364f
fix: allow deprecation-free parsing of TyS condition
jonaseberle May 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .coveralls.yml

This file was deleted.

255 changes: 180 additions & 75 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,89 +1,103 @@
name: extension-cookieman-master
type: typo3
docroot: .build/public
php_version: "8.1"
php_version: "8.2"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: false
additional_hostnames: [ ]
additional_fqdns: [ ]
mariadb_version: "10.4"
mysql_version: ""
provider: default
additional_hostnames: []
additional_fqdns: []
database:
type: mariadb
version: "10.11"
hooks:
post-start:
- composer: update --with-dependencies --no-progress
- exec: rm composer.lock
- exec: |
if [[ $(mysql -e "SHOW TABLES" | wc -l) -eq 0 ]]; then
composer install-typo3
mysql <<< 'INSERT INTO pages SET uid=2, pid=1, title="Imprint", slug="/imprint"'
mysql <<< 'INSERT INTO pages SET uid=3, pid=1, title="Privacy Policy", slug="/privacy"'
fi
pre-start:
- exec-host: mkdir -p .build/public/typo3conf/
- exec-host: .ddev/commands/copy-git-config
project_tld: test
post-start:
- composer: update --with-dependencies --no-progress
- exec: rm -f composer.lock
- exec: |
if [[ $(mysql -e "SHOW TABLES" | wc -l) -eq 0 ]]; then
composer typo3 install:setup -- --admin-user-name=admin --admin-password='aaAA11!!' \
--site-setup-type=site --no-interaction --force
mysql <<< 'INSERT INTO pages SET uid=2, pid=1, title="Imprint", slug="/imprint"'
mysql <<< 'INSERT INTO pages SET uid=3, pid=1, title="Privacy Policy", slug="/privacy"'
fi
pre-start:
- exec-host: .ddev/commands/copy-git-config
use_dns_when_possible: true
composer_version: "2"
web_environment: []


# This config.yaml was created with ddev version v1.16.0
# webimage: drud/ddev-webserver:v1.16.0
# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.16.0
# dbaimage: phpmyadmin:5
# 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'.

# Key features of ddev's config.yaml:
# Key features of DDEV's config.yaml:

# name: <projectname> # Name of the project, automatically provides
# http://projectname.ddev.site and https://projectname.ddev.site

# type: <projecttype> # drupal6/7/8, backdrop, typo3, wordpress, php
# type: <projecttype> # backdrop, craftcms, django4, drupal6/7/8/9/10, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress
# See https://ddev.readthedocs.io/en/latest/users/quickstart/ for more
# information on the different project types

# docroot: <relative_path> # Relative path to the directory containing index.php.

# php_version: "7.3" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0"
# php_version: "8.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"

# You can explicitly specify the webimage, dbimage, dbaimage lines but this
# is not recommended, as the images are often closely tied to ddev's' behavior,
# You can explicitly specify the webimage but this
# is not recommended, as the images are often closely tied to DDEV's' behavior,
# so this can break upgrades.

# webimage: <docker_image> # nginx/php docker image.
# dbimage: <docker_image> # mariadb docker image.
# dbaimage: <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
# database:
# type: <dbtype> # mysql, mariadb, postgres
# version: <version> # database version, like "10.4" or "8.0"
# MariaDB versions can be 5.5-10.8 and 10.11, MySQL versions can be 5.5-8.0
# PostgreSQL versions can be 9-16.

# 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_http_port: <port> # Port to be used for http (defaults to global configuration, usually 80)
# router_https_port: <port> # Port for https (defaults to global configuration, usually 443)

# xdebug_enabled: false # Set to true to enable Xdebug and "ddev start" or "ddev restart"
# Note that for most people the commands
# "ddev xdebug" to enable Xdebug and "ddev xdebug off" to disable it work better,
# as leaving Xdebug enabled all the time is a big performance hit.

# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
# xhprof_enabled: false # Set to true to enable Xhprof and "ddev start" or "ddev restart"
# Note that for most people the commands
# "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better,
# as leaving xdebug enabled all the time is a big performance hit.
# "ddev xhprof" to enable Xhprof and "ddev xhprof off" to disable it work better,
# as leaving Xhprof enabled all the time is a big performance hit.

# webserver_type: nginx-fpm # or apache-fpm
# webserver_type: nginx-fpm, apache-fpm, or nginx-gunicorn

# timezone: Europe/Berlin
# This is the timezone used in the containers and by PHP;
# 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

# composer_root: <relative_path>
# Relative path to the Composer root directory from the project root. This is
# the directory which contains the composer.json and where all Composer related
# commands are executed.

# composer_version: "2"
# if composer_version:"" it will use the current ddev default composer release.
# It can also be set to "1", to get most recent composer v1
# or "2" for most recent composer v2.
# It can be set to any existing specific composer version.
# After first project 'ddev start' this will not be updated until it changes
# You can set it to "" or "2" (default) for Composer v2 or "1" for Composer v1
# to use the latest major version available at the time your container is built.
# It is also possible to use each other Composer version channel. This includes:
# - 2.2 (latest Composer LTS version)
# - stable
# - preview
# - snapshot
# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
# To reinstall Composer after the image was built, run "ddev debug refresh".

# nodejs_version: "18"
# change from the default system Node.js version to any other version.
# Numeric version numbers can be complete (i.e. 18.15.0) or
# incomplete (18, 17.2, 16). 'lts' and 'latest' can be used as well along with
# other named releases.
# see https://www.npmjs.com/package/n#specifying-nodejs-versions
# Note that you can continue using 'ddev nvm' or nvm inside the web container
# to change the project's installed node version if you need to.

# additional_hostnames:
# - somename
Expand All @@ -97,8 +111,26 @@ composer_version: "2"
# would provide http and https URLs for "example.com" and "sub1.example.com"
# Please take care with this because it can cause great confusion.

# upload_dir: custom/upload/dir
# would set the destination path for ddev import-files to custom/upload/dir.
# upload_dirs: "custom/upload/dir"
#
# upload_dirs:
# - custom/upload/dir
# - ../private
#
# would set the destination paths for ddev import-files to <docroot>/custom/upload/dir
# When Mutagen is enabled this path is bind-mounted so that all the files
# in the upload_dirs don't have to be synced into Mutagen.

# disable_upload_dirs_warning: false
# If true, turns off the normal warning that says
# "You have Mutagen enabled and your 'php' project type doesn't have upload_dirs set"

# ddev_version_constraint: ""
# Example:
# ddev_version_constraint: ">= 1.22.4"
# This will enforce that the running ddev version is within this constraint.
# See https://github.com/Masterminds/semver#checking-version-constraints for
# supported constraint formats

# working_dir:
# web: /var/www/html
Expand All @@ -107,15 +139,28 @@ composer_version: "2"
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.

# omit_containers: [db, dba, ddev-ssh-agent]
# omit_containers: [db, ddev-ssh-agent]
# Currently only these containers are supported. Some containers can also be
# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
# the "db" container, several standard features of ddev that access the
# database container will be unusable.
# the "db" container, several standard features of DDEV that access the
# database container will be unusable. In the global configuration it is also
# possible to omit ddev-router, but not here.

# performance_mode: "global"
# DDEV offers performance optimization strategies to improve the filesystem
# performance depending on your host system. Should be configured globally.
#
# If set, will override the global config. Possible values are:
# - "global": uses the value from the global config.
# - "none": disables performance optimization for this project.
# - "mutagen": enables Mutagen for this project.
# - "nfs": enables NFS for this project.
#
# See https://ddev.readthedocs.io/en/latest/users/install/performance/#nfs
# See https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen

# nfs_mount_enabled: false
# Great performance improvement but requires host configuration first.
# See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container
# fail_on_hook_fail: False
# Decide whether 'ddev start' should be interrupted by a failing hook

# host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is
Expand All @@ -133,15 +178,15 @@ composer_version: "2"
# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic
# unless explicitly specified.

# phpmyadmin_port: "8036"
# phpmyadmin_https_port: "8037"
# The PHPMyAdmin ports can be changed from the default 8036 and 8037
# mailpit_http_port: "8025"
# mailpit_https_port: "8026"
# The Mailpit ports can be changed from the default 8025 and 8026

# mailhog_port: "8025"
# mailhog_https_port: "8026"
# The MailHog ports can be changed from the default 8025 and 8026
# host_mailpit_port: "8025"
# The mailpit port is not normally bound on the host at all, instead being routed
# through ddev-router, but it can be bound directly to localhost if specified here.

# webimage_extra_packages: [php7.3-tidy, php-bcmath]
# webimage_extra_packages: [php7.4-tidy, php-bcmath]
# Extra Debian packages that are needed in the webimage can be added here

# dbimage_extra_packages: [telnet,netcat]
Expand All @@ -159,27 +204,87 @@ composer_version: "2"
# If you prefer you can change this to "ddev.local" to preserve
# pre-v1.9 behavior.

# ngrok_args: --subdomain mysite --auth username:pass
# ngrok_args: --basic-auth username:pass1234
# Provide extra flags to the "ngrok http" command, see
# https://ngrok.com/docs#http or run "ngrok http -h"
# https://ngrok.com/docs/ngrok-agent/config or run "ngrok http -h"

# disable_settings_management: false
# If true, ddev will not create CMS-specific settings files like
# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalSettings.php
# If true, DDEV will not create CMS-specific settings files like
# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php
# In this case the user must provide all such settings.

# You can inject environment variables into the web container with:
# web_environment:
# - SOMEENV=somevalue
# - SOMEOTHERENV=someothervalue

# no_project_mount: false
# (Experimental) If true, ddev will not mount the project into the web container;
# (Experimental) If true, DDEV will not mount the project into the web container;
# the user is responsible for mounting it manually or via a script.
# This is to enable experimentation with alternate file mounting strategies.
# For advanced users only!

# provider: default # Currently either "default" or "pantheon"
# bind_all_interfaces: false
# If true, host ports will be bound on all network interfaces,
# not the localhost interface only. This means that ports
# will be available on the local network if the host firewall
# allows it.

# default_container_timeout: 120
# The default time that DDEV waits for all containers to become ready can be increased from
# the default 120. This helps in importing huge databases, for example.

#web_extra_exposed_ports:
#- name: nodejs
# container_port: 3000
# http_port: 2999
# https_port: 3000
#- name: something
# container_port: 4000
# https_port: 4000
# http_port: 3999
# Allows a set of extra ports to be exposed via ddev-router
# Fill in all three fields even if you don’t intend to use the https_port!
# If you don’t add https_port, then it defaults to 0 and ddev-router will fail to start.
#
# Many ddev commands can be extended to run tasks before or after the
# ddev command is executed, for example "post-start", "post-import-db",
# The port behavior on the ddev-webserver must be arranged separately, for example
# using web_extra_daemons.
# For example, with a web app on port 3000 inside the container, this config would
# expose that web app on https://<project>.ddev.site:9999 and http://<project>.ddev.site:9998
# web_extra_exposed_ports:
# - name: myapp
# container_port: 3000
# http_port: 9998
# https_port: 9999

#web_extra_daemons:
#- name: "http-1"
# command: "/var/www/html/node_modules/.bin/http-server -p 3000"
# directory: /var/www/html
#- name: "http-2"
# command: "/var/www/html/node_modules/.bin/http-server /var/www/html/sub -p 3000"
# directory: /var/www/html

# override_config: false
# By default, config.*.yaml files are *merged* into the configuration
# But this means that some things can't be overridden
# For example, if you have 'use_dns_when_possible: true'' you can't override it with a merge
# and you can't erase existing hooks or all environment variables.
# However, with "override_config: true" in a particular config.*.yaml file,
# 'use_dns_when_possible: false' can override the existing values, and
# hooks:
# post-start: []
# or
# web_environment: []
# or
# additional_hostnames: []
# can have their intended affect. 'override_config' affects only behavior of the
# config.*.yaml file it exists in.

# 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
# See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/ for more
# information on the commands that can be extended and the tasks you can define
# for them. Example:
#hooks:
Expand Down
13 changes: 6 additions & 7 deletions .ddev/docker-compose.env.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
version: '3.6'
services:
web:
environment:
- PHP_IDE_CONFIG=serverName=${DDEV_SITENAME}
- TYPO3_CONTEXT=Development/Local
- BROWSERSTACK_USERNAME=${BROWSERSTACK_USERNAME}
- BROWSERSTACK_ACCESS_KEY=${BROWSERSTACK_ACCESS_KEY}
web:
environment:
- PHP_IDE_CONFIG=serverName=${DDEV_SITENAME}
- TYPO3_CONTEXT=Development/Local
- BROWSERSTACK_USERNAME=${BROWSERSTACK_USERNAME}
- BROWSERSTACK_ACCESS_KEY=${BROWSERSTACK_ACCESS_KEY}
Loading
Loading