Skip to content

Commit

Permalink
Merge branch 'release/0.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
eliashaeussler committed Mar 11, 2022
2 parents e97ee7b + 6cc44a4 commit 6de6156
Show file tree
Hide file tree
Showing 118 changed files with 5,598 additions and 842 deletions.
63 changes: 45 additions & 18 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,45 @@
name: typo3-ext-form-consent
type: typo3
docroot: .Build/web
php_version: "8.1"
php_version: "7.4"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: false
additional_hostnames: []
additional_fqdns: []
mariadb_version: "10.3"
mysql_version: ""
database:
type: mariadb
version: "10.3"
nfs_mount_enabled: false
mutagen_enabled: false
hooks:
post-start:
- composer: environment:prepare
- exec-host: ddev import-files --src Tests/Acceptance/Data/Fileadmin
omit_containers: [dba]
webimage_extra_packages: [php8.1-pcov]
use_dns_when_possible: true
composer_version: ""
composer_version: "2"
disable_settings_management: true
web_environment:
- XDEBUG_MODE=coverage
- TYPO3_CONTEXT=Development/Ddev
# DB configuration for functional tests
- typo3DatabaseHost=db
- typo3DatabaseUsername=root
- typo3DatabasePassword=root
- typo3DatabaseName=db
# Domain configuration
- TESTING_DOMAIN=$DDEV_HOSTNAME
# Environment variables for TYPO3 installation
- TYPO3_INSTALL_DB_USER=db
- TYPO3_INSTALL_DB_PASSWORD=db
- TYPO3_INSTALL_DB_HOST=db
- TYPO3_INSTALL_DB_USE_EXISTING=0
- TYPO3_INSTALL_DB_DBNAME=db
- TYPO3_INSTALL_ADMIN_USER=admin
- TYPO3_INSTALL_ADMIN_PASSWORD=password
nodejs_version: "16"

# Key features of ddev's config.yaml:

Expand All @@ -31,21 +50,19 @@ web_environment:

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

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

# You can explicitly specify the webimage, dbimage, dbaimage lines but this
# 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
# version: <version> # database version, like "10.3" or "8.0"
# Note that mariadb_version or mysql_version from v1.18 and earlier
# will automatically be converted to this notation with just a "ddev config --auto"

# router_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443)
Expand All @@ -68,13 +85,23 @@ web_environment:
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# For example Europe/Dublin or MST7MDT

# composer_version: ""
# if composer_version:"" it will use the current ddev default composer release.
# 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:"2" it will use the most recent composer v2
# It can also be set to "1", to get most recent composer v1
# or "2" for most recent composer v2.
# or "" for the default v2 created at release time.
# It can be set to any existing specific composer version.
# After first project 'ddev start' this will not be updated until it changes

# nodejs_version: "16"
# change from the default system Node.js version to another supported version, like 12, 14, 17.
# Note that you can use 'ddev nvm' or nvm inside the web container to provide nearly any
# Node.js version, including v6, etc.

# additional_hostnames:
# - somename
# - someothername
Expand All @@ -88,7 +115,7 @@ web_environment:
# 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.
# would set the destination path for ddev import-files to <docroot>/custom/upload/dir

# working_dir:
# web: /var/www/html
Expand Down
19 changes: 19 additions & 0 deletions .ddev/docker-compose.selenium.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: '3.6'

services:
web:
depends_on:
- db
- selenium
selenium:
container_name: ddev-${DDEV_SITENAME}-selenium
image: selenium/standalone-chrome-debug:3.13.0-argon
networks:
default:
aliases:
- web
ddev_default:
volumes:
- /dev/shm:/dev/shm
external_links:
- ddev-router:$DDEV_HOSTNAME
4 changes: 3 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@
/.gitignore export-ignore
/.php-cs-fixer.php export-ignore
/captainhook.json export-ignore
/codeception.yml export-ignore
/codecov.yml export-ignore
/dependency-checker.json export-ignore
/packaging_exclude.php export-ignore
/phpstan.neon export-ignore
/phpstan-baseline.neon export-ignore
/phpunit.ci.functional.xml export-ignore
/phpunit.ci.unit.xml export-ignore
/phpunit.functional.xml export-ignore
/phpunit.unit.xml export-ignore
/sonar-project.properties export-ignore
/typoscript-lint.yml export-ignore
30 changes: 0 additions & 30 deletions .github/ISSUE_TEMPLATE/bug-report.md

This file was deleted.

85 changes: 85 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
name: Bug report
description: Create a report to help improve the extension.
title: "[BUG]"
labels:
- bug
assignees:
- eliashaeussler
body:
- type: input
id: typo3-version
attributes:
label: TYPO3 version
description: What TYPO3 version are you using?
placeholder: 'e.g. 10.4.17'
validations:
required: true
- type: input
id: php-version
attributes:
label: PHP version
description: What PHP version are you using?
placeholder: 'e.g. 7.4.27'
validations:
required: true
- type: input
id: extension-version
attributes:
label: Extension version
description: What version of EXT:form_consent are you using?
placeholder: 'e.g. 0.3.2'
validations:
required: true
- type: checkboxes
id: composer-mode
attributes:
label: Composer mode
description: Are you running TYPO3 in composer mode?
options:
- label: I'm running TYPO3 in composer mode.
required: true
- type: input
id: operating-system
attributes:
label: Operating system
description: What operating system are you using?
placeholder: 'e.g. macOS 11.4'
validations:
required: true
- type: textarea
attributes:
label: Current behavior
description: A clear and concise description of what the bug is.
- type: textarea
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
- type: textarea
attributes:
label: Steps to reproduce
description: If possible, describe steps to reproduce the behavior.
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
- type: textarea
attributes:
label: Additional context
description: Add any other context about the problem here.
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: |
By submitting this issue, you agree to follow our
[Code of Conduct](https://github.com/eliashaeussler/typo3-form-consent/blob/main/.github/CODE_OF_CONDUCT.md).
options:
- label: I agree to follow this project's Code of Conduct.
required: true
- type: markdown
attributes:
value: |
:bulb: **Tip:** Have you already looked into our
[Slack channel](https://typo3.slack.com/archives/C03719PJJJD)? Maybe your problem has
already been discussed there.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Community support
url: https://typo3.slack.com/archives/C03719PJJJD
about: Please ask and answer questions here.
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

47 changes: 47 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Feature request
description: Suggest an idea for this extension.
title: "[FEATURE]"
labels:
- enhancement
assignees:
- eliashaeussler
body:
- type: textarea
attributes:
label: Is your feature request related to a problem?
description: A clear and concise description of what the problem is.
placeholder: I'm always frustrated when [...]
validations:
required: true
- type: textarea
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
attributes:
label: Describe alternatives you've considered
description: |
A clear and concise description of any alternative solutions or features
you've considered.
- type: textarea
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: |
By submitting this issue, you agree to follow our
[Code of Conduct](https://github.com/eliashaeussler/typo3-form-consent/blob/main/.github/CODE_OF_CONDUCT.md).
options:
- label: I agree to follow this project's Code of Conduct.
required: true
- type: markdown
attributes:
value: |
:bulb: **Tip:** Have you already looked into our
[Slack channel](https://typo3.slack.com/archives/C03719PJJJD)? Maybe your problem has
already been discussed there.
17 changes: 13 additions & 4 deletions .github/workflows/cgl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [push, pull_request]

jobs:
cgl:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
fail-fast: false
steps:
Expand All @@ -16,15 +16,24 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: 8.1
tools: composer:v2
tools: composer:v2, composer-require-checker

# Validation
- name: Validate composer.json
run: composer validate --no-check-lock

# Install dependencies
- name: Install Composer dependencies
run: composer install --no-progress
run: composer require --no-progress --no-plugins typo3/cms-dashboard:"~10.4.11 || ~11.5.0" typo3/cms-scheduler:"~10.4.11 || ~11.5.0"

# Check Composer dependencies
- name: Check dependencies
run: composer-require-checker check --config-file dependency-checker.json
- run: composer install --no-progress

# Linting
- name: Lint composer.json
run: composer normalize --dry-run --no-check-lock --no-update-lock
run: composer lint:composer -- --dry-run
- name: Lint Editorconfig
run: .Build/bin/ec -e .Build
- name: Lint PHP
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
# Job: Create release
release:
if: startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
outputs:
release-notes-url: ${{ steps.create-release.outputs.url }}
steps:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
ter-publish:
if: startsWith(github.ref, 'refs/tags/')
needs: [release]
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
TYPO3_EXTENSION_KEY: form_consent
TYPO3_API_TOKEN: ${{ secrets.TYPO3_API_TOKEN }}
Expand Down
Loading

0 comments on commit 6de6156

Please sign in to comment.