Merge branch 'release/v11.0'

.ddev/commands/host/db-backup

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+## Description: Backup db
+## Usage: db-backup
+## Example: "ddev db-backup"
+
+ddev exec mkdir -p ./.ddev/backup
+
+ddev exec rm -f ./.ddev/backup/mysql-db.sql.gz
+
+ddev export-db -f ./.ddev/backup/mysql-db.sql.gz

.ddev/commands/host/db-restore

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+## Description: Restore db
+## Usage: db-restore
+## Example: "ddev db-restore"
+
+ddev import-db --src=./.ddev/backup/mysql-db.sql.gz
+
+ddev typo3cms database:updateschema

.ddev/commands/host/fileadmin-backup

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+## Description: Backup fileadmin folder
+## Usage: fileadmin-backup
+## Example: "ddev fileadmin-backup"
+
+ddev exec mkdir -p ./.ddev/backup
+
+ddev exec rm -f ./.ddev/backup/fileadmin.tar.gz
+
+ddev exec tar -czvf ./.ddev/backup/fileadmin.tar.gz --exclude="_processed_" ./public/fileadmin

.ddev/commands/host/fileadmin-restore

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+## Description: Restore fileadmin folder
+## Usage: fileadmin-restore
+## Example: "ddev fileadmin-restore"
+
+ddev exec mv ./public/fileadmin ./public/fileadmin-org
+
+ddev exec tar -xzvf ./.ddev/backup/fileadmin.tar.gz
+
+ddev typo3cms cache:flush
+
+ddev typo3cms database:updateschema
+
+ddev exec rm -rf ./public/fileadmin-org

.ddev/commands/host/rector

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# This assumes that the rector command will be in vendor/bin/
+
+## Description: Run rector command
+## Usage: rector [args]
+## Example: "ddev rector process packages/my-extension --dry-run"
+
+ddev exec ./vendor/bin/rector "$@"

.ddev/config.yaml

@@ -8,15 +8,17 @@ router_https_port: "443"
 xdebug_enabled: false
 additional_hostnames: []
 additional_fqdns: []
-mariadb_version: "10.3"
-mysql_version: ""
-nfs_mount_enabled: true
-mutagen_enabled: false
+database:
+  type: mariadb
+  version: "10.3"
+nfs_mount_enabled: false
+mutagen_enabled: true
 use_dns_when_possible: true
-composer_version: "2"
 timezone: Europe/Berlin
+composer_version: "2"
 web_environment:
-  - TYPO3_CONTEXT=Development
+- TYPO3_CONTEXT=Development
+nodejs_version: "16"
 
 # Key features of ddev's config.yaml:
 
@@ -29,19 +31,17 @@ web_environment:
 
 # 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)
@@ -64,13 +64,23 @@ web_environment:
 # 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:"2" it will use the most recent composer v2
 # It can also be set to "1", to get most recent composer v1
 # 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

.ddev/homeadditions/.bash_aliases

@@ -0,0 +1 @@
+alias ls="ls -lhA"

.editorconfig

@@ -1,5 +1,3 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
 # top-most EditorConfig file
 root = true
 
@@ -12,40 +10,44 @@ indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-# TS/JS-Files
-[*.{ts,js}]
-indent_size = 4
+# JS files
+[*.js]
+indent_size = 2
 
-# JSON-Files
+# JSON files
 [*.json]
-indent_style = space
-indent_size = 4
+indent_style = tab
 
-# ReST-Files
+# package.json
+[package.json]
+indent_size = 2
+
+# ReST files
 [*.rst]
 indent_size = 3
+max_line_length = 80
 
-# YAML-Files
-[*.{yaml,yml}]
+# SQL files
+[*.sql]
+indent_style = tab
 indent_size = 2
 
-# package.json
-[package.json]
+# TypoScript files
+[*.{typoscript,tsconfig}]
 indent_size = 2
 
-# TypoScript
-[*.{typoscript,tsconfig}]
+# YAML files
+[{*.yml,*.yaml}]
 indent_size = 2
 
-# XLF-Files
+# XLF files
 [*.xlf]
 indent_style = tab
 
-# SQL-Files
-[*.sql]
-indent_style = tab
-indent_size = 2
-
 # .htaccess
-[{_.htaccess,.htaccess}]
+[.htaccess]
 indent_style = tab
+
+# Markdown files
+[*.md]
+max_line_length = 80

.env.example

@@ -0,0 +1,25 @@
+TYPO3_CONTEXT=
+INSTANCE=
+
+# Site
+SITE_BASE=
+
+# System
+TYPO3_TRUSTED_HOST_PATTERN=
+TYPO3_DISPLAY_ERRORS=
+
+# Database Credentials
+TYPO3__DB__Connections__Default__dbname=
+TYPO3__DB__Connections__Default__host=
+TYPO3__DB__Connections__Default__password=
+TYPO3__DB__Connections__Default__port=
+TYPO3__DB__Connections__Default__user=
+
+# Graphics
+TYPO3_GFX_PROCESSOR=
+TYPO3_GFX_PROCESSOR_PATH=
+TYPO3_GFX_PROCESSOR_PATH_LZW=
+
+# Mail
+TYPO3_MAIL_TRANSPORT=
+TYPO3_MAIL_TRANSPORT_SMTP_SERVER=

.github/workflows/createNewRelease.yml

@@ -0,0 +1,37 @@
+name: Create Release
+
+on:
+    push:
+        # Push events to matching v*, i.e. v1.0, v20.15.10
+        tags:
+            - 'v*'
+
+jobs:
+    build:
+        name: Create Release
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v2
+              with:
+                  fetch-depth: 0
+            - name: changelog
+              uses: scottbrenner/generate-changelog-action@master
+              id: Changelog
+              env:
+                  REPO: ${{ github.repository }}
+            - name: Set output
+              id: vars
+              run: echo ::set-output name=tag::${GITHUB_REF:10}
+            - name: Create Release
+              id: create_release
+              uses: actions/create-release@latest
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+              with:
+                  tag_name: ${{ steps.vars.outputs.tag }}
+                  release_name: Release ${{ steps.vars.outputs.tag }}
+                  body: |
+                      ${{ steps.Changelog.outputs.changelog }}
+                  draft: false
+                  prerelease: false

.gitignore

@@ -36,6 +36,9 @@
 .php_cs.cache
 /composer.phar
 /Quellen/
+/Build/node_modules/
+/Build/cypress/demo-tests/
+/Build/cypress/screenshots/
 
 ### DDEV ###
 .ddev/backup/*
@@ -53,6 +56,5 @@
 !/public/typo3conf/PackageStates.php
 !/public/.htaccess
 
-/packages/skomtest
-
+/packages/customer_sitepackage/Resources/Public/*
 .env

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/klaro_video"]
+	path = packages/klaro_video
+	url = https://github.com/Starraider/klaro_video.git

.prettierrc

@@ -0,0 +1,24 @@
+{
+    "trailingComma": "es5",
+    "tabWidth": 4,
+    "semi": false,
+    "singleQuote": true,
+    "arrowParens": "avoid",
+    "overrides": [
+        {
+            "files": "*.js",
+            "options": {
+                "semi": false,
+                "tabWidth": 2,
+                "useTabs": false
+            }
+        },
+        {
+            "files": ["*.json"],
+            "options": {
+                "tabWidth": 4,
+                "useTabs": true
+            }
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,45 @@
+{
+    /**
+     * PHP CS Fixer
+     * Use composer intalled php-cs-fixer
+     **/
+    "php-cs-fixer.onsave": true,
+    "php-cs-fixer.showOutput": true,
+    "php-cs-fixer.executablePath": "${workspaceFolder}/vendor/bin/php-cs-fixer",
+    "php-cs-fixer.autoFixByBracket": true,
+    "php-cs-fixer.formatHtml": true,
+
+    /**
+     * PHPStan
+     **/
+    "phpstan.enabled": true,
+    //"phpstan.path": null,
+    "phpstan.level": "max",
+    "phpstan.memoryLimit": "2048M",
+    "phpstan.projectFile": "${workspaceFolder}/phpstan.neon",
+    "phpstan.excludeFiles": [],
+    "phpstan.options": [],
+
+    /**
+     * Prettier
+     **/
+    "[javascript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.formatOnSave": true
+    },
+    "[jsonc]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.formatOnSave": true
+    },
+    "[json]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.formatOnSave": true
+    },
+    "prettier.requireConfig": true,
+    "prettier.useEditorConfig": false,
+    // Disable ESLint, because we use Prettier
+    "eslint.enable": false,
+
+    "restructuredtext.languageServer.disabled": true,
+    "workbench.activityBar.visible": false
+}