Merge branch 'release/1.6.0'

Author: rimi-itk

.env

@@ -1,18 +1,38 @@
 COMPOSE_PROJECT_NAME=kunstdatabasen
 COMPOSE_DOMAIN=kunstdatabasen.local.itkdev.dk
 
+# In all environments, the following files are loaded if they exist,
+# the latter taking precedence over the former:
+#
+#  * .env                contains default values for the environment variables needed by the app
+#  * .env.local          uncommitted file with local overrides
+#  * .env.$APP_ENV       committed environment-specific defaults
+#  * .env.$APP_ENV.local uncommitted environment-specific overrides
+#
+# Real environment variables win over .env files.
+#
+# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+# https://symfony.com/doc/current/configuration/secrets.html
+#
+# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
+# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
+
+###> symfony/framework-bundle ###
+APP_ENV=dev
+APP_SECRET=83a0940fa78a31b062599eb0973b38bc
+###< symfony/framework-bundle ###
+
 ###> doctrine/doctrine-bundle ###
 # Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
-# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
-# For a PostgreSQL database, use: "postgresql://db_user:[email protected]:5432/db_name?serverVersion=11&charset=utf8"
 # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
-# Override to point to mariadb docker container.
+#
+# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
+# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
+# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
+# DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
 DATABASE_URL=mysql://db:db@mariadb:3306/db
-# Override to use mariadb as backend
-DATABASE_SERVER_VERSION='mariadb-10.3.13'
 ###< doctrine/doctrine-bundle ###
 
-APP_SECRET=NotSoSecretReplace
-
 SUPPORT_MAIL=''
 SITEIMPROVE_KEY=''
+WEB_ACCESSIBILITY_STATEMENT_URL='https://www.was.digst.dk/kunstdatabasen'

.github/workflows/deployment_dev.yml

@@ -1,39 +1,30 @@
 on: pull_request
 name: Review
 jobs:
-    test-composer-files:
-        name: Validate composer (PHP ${{ matrix.php }})
-        runs-on: ubuntu-20.04
+    changelog:
+        runs-on: ubuntu-latest
+        name: Changelog should be updated
         strategy:
             fail-fast: false
-            matrix:
-                php: ['7.3', '7.4']
         steps:
-            -   uses: actions/checkout@master
-            -   name: Setup PHP, with composer and extensions
-                uses: shivammathur/setup-php@master
-                with:
-                    php-version: ${{ matrix.php }}
-                    extension-csv: ctype, dom, iconv, json
-                    coverage: none
-            -   name: Get composer cache directory
-                id: composer-cache
-                run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-            -   uses: actions/cache@v1
-                with:
-                    path: ${{ steps.composer-cache.outputs.dir }}
-                    key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
-                    restore-keys: ${{ matrix.php }}-composer-
-            -   name: Validate composer files
-                run: composer validate composer.json
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  fetch-depth: 2
+
+            - name: Git fetch
+              run: git fetch
 
-    runner-phpcs:
-        name: runner-phpcs (PHP ${{ matrix.php }})
+            - name: Check that changelog has been updated.
+              run: git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md && exit 1 || exit 0
+
+    test-composer-files:
+        name: Validate composer (PHP ${{ matrix.php }})
         runs-on: ubuntu-20.04
         strategy:
             fail-fast: false
             matrix:
-                php: ['7.3', '7.4']
+                php: ['8.1']
         steps:
             - uses: actions/checkout@master
             - name: Setup PHP, with composer and extensions
@@ -42,30 +33,24 @@ jobs:
                   php-version: ${{ matrix.php }}
                   extension-csv: ctype, dom, iconv, json
                   coverage: none
-            -   name: Get composer cache directory
-                id: composer-cache
-                run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-            -   uses: actions/cache@v1
-                with:
-                    path: ${{ steps.composer-cache.outputs.dir }}
-                    key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
-                    restore-keys: ${{ matrix.php }}-composer-
-            - name: Install Reviewdog
-              run: wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s -- -b $PWD/ v0.9.14
-            - name: Install Dependencies
-              run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
-            - name: PHPCS
-              run: composer actions/phpcs | ./reviewdog -f=checkstyle -name=PHPCS -reporter=github-pr-check
-              env:
-                  REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            - name: Get composer cache directory
+              id: composer-cache
+              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v1
+              with:
+                  path: ${{ steps.composer-cache.outputs.dir }}
+                  key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: ${{ matrix.php }}-composer-
+            - name: Validate composer files
+              run: composer validate composer.json
 
     phpcsfixer:
         name: PHP-CS-FIXER (PHP ${{ matrix.php }})
         runs-on: ubuntu-20.04
         strategy:
             fail-fast: false
             matrix:
-                php: ['7.3', '7.4']
+                php: ['8.1']
         steps:
             - uses: actions/checkout@master
             - name: Setup PHP, with composer and extensions
@@ -84,7 +69,7 @@ jobs:
                     restore-keys: ${{ matrix.php }}-composer-
             - name: Install Dependencies
               run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
-            - name: phpcsfixerr
+            - name: phpcsfixer
               run: composer actions/phpcsfixer
 
     twigcs:
@@ -93,7 +78,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ['7.3', '7.4']
+                php: ['8.1']
         steps:
             - uses: actions/checkout@master
             - name: Setup PHP, with composer and extensions
@@ -122,11 +107,11 @@ jobs:
             - uses: actions/checkout@master
             - uses: actions/setup-node@v1
               with:
-                  node-version: '10.x'
+                  node-version: '18.x'
             - name: install
               run: yarn install
             - name: JS coding standards
-              run: yarn check-coding-standards
+              run: yarn coding-standards-check
 
     test-yarn-build:
         name: Test yarn build assets
@@ -144,7 +129,7 @@ jobs:
                   restore-keys: yarn-
 
             - name: Install yarn packages
-              run: docker run -v $PWD:/app:rw -v ${{ steps.yarn-cache.outputs.dir }}:/usr/local/share/.cache/yarn/v6:rw --workdir /app node:14 yarn install
+              run: docker run -v $PWD:/app:rw -v ${{ steps.yarn-cache.outputs.dir }}:/usr/local/share/.cache/yarn/v6:rw --workdir /app node:18 yarn install
 
             - name: Build assets
-              run: docker run -v $PWD:/app:rw -v ${{ steps.yarn-cache.outputs.dir }}:/usr/local/share/.cache/yarn/v6:rw --workdir /app node:14 yarn build
+              run: docker run -v $PWD:/app:rw -v ${{ steps.yarn-cache.outputs.dir }}:/usr/local/share/.cache/yarn/v6:rw --workdir /app node:18 yarn build

.github/workflows/deployment_prod.yml

@@ -1,4 +1,3 @@
-
 ###> symfony/framework-bundle ###
 /.env.local
 /.env.local.php
@@ -21,15 +20,9 @@
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
-
-###> squizlabs/php_codesniffer ###
-/.phpcs-cache
-/phpcs.xml
-###< squizlabs/php_codesniffer ###
-
 ###> friendsofphp/php-cs-fixer ###
-/.php_cs
-/.php_cs.cache
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
 ###< friendsofphp/php-cs-fixer ###
 
 ###> liip/imagine-bundle ###

.github/workflows/pr.yaml

@@ -0,0 +1,12 @@
+{
+    // @see https://github.com/DavidAnson/markdownlint/blob/main/schema/.markdownlint.jsonc
+    // MD013/line-length - Line length
+    "MD013": {
+        // Exclude code blocks
+        "code_blocks": false
+    }
+}
+
+// Local Variables:
+// mode: json
+// End:

.gitignore

@@ -9,7 +9,7 @@
 This source file is subject to the MIT license.
 HEADER;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules(
         [