Skip to content

Commit 9190852

Browse files
rimi-itkrimi-itk
committed
Merge branch 'develop'
2 parents 4d735bc + ec1e26d commit 9190852

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2779
-3723
lines changed

‎.editorconfig‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
1-
; top-most EditorConfig file
1+
# EditorConfig is awesome: https://editorconfig.org
2+
3+
# top-most EditorConfig file
24
root = true
35

4-
; Unix-style newlines
6+
# Unix-style newlines with a newline ending every file
57
[*]
6-
charset = utf-8
7-
end_of_line = LF
8+
end_of_line = lf
89
insert_final_newline = true
910
trim_trailing_whitespace = true
11+
charset = utf-8
1012
indent_style = space
11-
12-
[*.{php,html,twig,js,css,scss,json,yaml}]
1313
indent_size = 4
1414

15-
[*.{css,scss}]
15+
[*.{css,js,yaml,yml}]
1616
indent_size = 2
1717

18-
[*.min.js,*.min.css]
19-
exclude = true
20-
21-
[*.md]
22-
max_line_length = 80
23-
24-
[COMMIT_EDITMSG]
25-
max_line_length = 0
18+
[config/**/*.{yaml,yml}]
19+
indent_size = 4

‎.env‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ITKDEV_TEMPLATE=symfony-6
2020

2121
###> symfony/framework-bundle ###
2222
APP_ENV=dev
23-
APP_SECRET=83a0940fa78a31b062599eb0973b38bc
23+
APP_SECRET=
2424
###< symfony/framework-bundle ###
2525

2626
###> doctrine/doctrine-bundle ###
@@ -31,7 +31,8 @@ APP_SECRET=83a0940fa78a31b062599eb0973b38bc
3131
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
3232
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
3333
# DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
34-
DATABASE_URL=mysql://db:db@mariadb:3306/db
34+
DATABASE_URL="mysql://db:db@mariadb:3306/db?serverVersion=10.11.10-MariaDB"
35+
3536
###< doctrine/doctrine-bundle ###
3637

3738
SUPPORT_MAIL=''

‎.env.dev‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
###> symfony/framework-bundle ###
3+
APP_SECRET=53e560057bb9115d1f7103096978813e
4+
###< symfony/framework-bundle ###

‎.github/workflows/build_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
on:
22
push:
33
tags:
4-
- '*.*.*'
4+
- "*.*.*"
55

66
name: Create Github Release
77

‎.github/workflows/styles.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
docker network create frontend
3434
3535
- run: |
36-
docker compose run --rm prettier 'assets/**/*.?css' --check
36+
docker compose run --rm prettier 'assets/**/*.{css,scss}' --check

‎.github/workflows/yaml.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Do not edit this file! Make a pull request on changing
2+
# github/workflows/yaml.yaml in
3+
# https://github.com/itk-dev/devops_itkdev-docker if need be.
4+
5+
### ### YAML
6+
###
7+
### Validates YAML files.
8+
###
9+
### #### Assumptions
10+
###
11+
### 1. A docker compose service named `prettier` for running
12+
### [Prettier](https://prettier.io/) exists.
13+
###
14+
### #### Symfony YAML
15+
###
16+
### Symfony's YAML config files use 4 spaces for indentation and single quotes.
17+
### Therefore we use a [Prettier configuration
18+
### file](https://prettier.io/docs/configuration), `.prettierrc.yaml`, to make
19+
### Prettier format YAML files in the `config/` folder like Symfony expects.
20+
21+
name: YAML
22+
23+
on:
24+
pull_request:
25+
push:
26+
branches:
27+
- main
28+
- develop
29+
30+
jobs:
31+
yaml-lint:
32+
runs-on: ubuntu-latest
33+
steps:
34+
- uses: actions/checkout@v4
35+
36+
- run: |
37+
docker network create frontend
38+
39+
- run: |
40+
docker compose run --rm prettier '**/*.{yml,yaml}' --check

‎.prettierrc.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This file is copied from config/symfony/yaml/.prettierrc.yaml in https://github.com/itk-dev/devops_itkdev-docker.
2+
# Feel free to edit the file, but consider making a pull request if you find a general issue with the file.
3+
4+
# https://prettier.io/docs/configuration
5+
overrides:
6+
# Symfony config
7+
- files:
8+
- "config/**/*.{yml,yaml}"
9+
options:
10+
tabWidth: 4
11+
singleQuote: true

‎.woodpecker/deployment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
from_secret: path
1919
user:
2020
from_secret: user
21-
playbook: 'release'
21+
playbook: "release"
2222
pre_up:
2323
- itkdev-docker-compose-server run --rm phpfpm bin/console cache:clear --no-interaction
2424
- itkdev-docker-compose-server run --rm phpfpm bin/console doctrine:migrations:migrate --no-interaction

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
## [Unreleased]
1010

11+
## [2.0.0] - 2025-07-09
12+
13+
* [PR-86](https://github.com/itk-dev/kunstdatabasen/pull/86)
14+
* Upgraded to Symfony 7.3 and PHP 8.4
15+
1116
## [1.8.1] - 2025-06-16
1217

1318
* [PR-92](https://github.com/itk-dev/kunstdatabasen/pull/92)
@@ -100,7 +105,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
100105

101106
## [1.0.0] - yyyy-mm-dd
102107

103-
[Unreleased]: https://github.com/itk-dev/kunstdatabasen/compare/1.8.1...HEAD
108+
[Unreleased]: https://github.com/itk-dev/kunstdatabasen/compare/2.0.0...HEAD
109+
[2.0.0]: https://github.com/itk-dev/kunstdatabasen/compare/1.8.1...2.0.0
104110
[1.8.1]: https://github.com/itk-dev/kunstdatabasen/compare/1.8.0...1.8.1
105111
[1.8.0]: https://github.com/itk-dev/kunstdatabasen/compare/1.7.1...1.8.0
106112
[1.7.1]: https://github.com/itk-dev/kunstdatabasen/compare/1.7.1...1.7.1

‎Taskfile.yml‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
version: "3"
2+
3+
# https://taskfile.dev/usage/#env-files
4+
dotenv: [".env.local", ".env"]
5+
6+
vars:
7+
# https://taskfile.dev/reference/templating/
8+
BASE_URL: '{{.TASK_BASE_URL | default .COMPOSE_SERVER_DOMAIN | default .COMPOSE_DOMAIN | default "https://kunstdatabasen.local.itkdev.dk"}}'
9+
DOCKER_COMPOSE: '{{.TASK_DOCKER_COMPOSE | default "docker compose"}}'
10+
11+
tasks:
12+
site:update:
13+
cmds:
14+
- task compose -- pull
15+
- task compose -- up --detach --remove-orphans --wait
16+
- task composer -- install
17+
- task console -- doctrine:migrations:migrate --no-interaction
18+
silent: true
19+
20+
fixtures:load:
21+
desc: "Load all fixtures"
22+
prompt: "This will reset your content. Continue?"
23+
cmds:
24+
- task compose -- exec phpfpm bin/console hautelook:fixtures:load --no-bundles
25+
silent: true
26+
27+
compose:
28+
cmds:
29+
- "{{.DOCKER_COMPOSE}} {{.CLI_ARGS}}"
30+
31+
composer:
32+
cmds:
33+
- task compose -- exec phpfpm composer {{.CLI_ARGS}}
34+
silent: true
35+
36+
console:
37+
cmds:
38+
- task compose -- exec phpfpm bin/console {{.CLI_ARGS}}
39+
silent: true
40+
41+
coding-standards:apply:
42+
desc: "Apply coding standards"
43+
cmds:
44+
- task: coding-standards:assets:apply
45+
- task: coding-standards:composer:apply
46+
- task: coding-standards:markdown:apply
47+
- task: coding-standards:php:apply
48+
- task: coding-standards:twig:apply
49+
- task: coding-standards:yaml:apply
50+
silent: true
51+
52+
coding-standards:check:
53+
desc: "Apply coding standards"
54+
cmds:
55+
- task: coding-standards:assets:check
56+
- task: coding-standards:composer:check
57+
- task: coding-standards:markdown:check
58+
- task: coding-standards:php:check
59+
- task: coding-standards:twig:check
60+
- task: coding-standards:yaml:check
61+
silent: true
62+
63+
coding-standards:assets:apply:
64+
desc: "Apply coding standards for assets"
65+
cmds:
66+
- task compose -- run --rm prettier 'assets/' --write
67+
68+
coding-standards:assets:check:
69+
desc: "Apply and check coding standards for assets"
70+
cmds:
71+
- task: coding-standards:assets:apply
72+
- task compose -- run --rm prettier 'assets/' --check
73+
74+
coding-standards:composer:apply:
75+
desc: "Apply coding standards for Composer"
76+
cmds:
77+
- task composer -- normalize
78+
79+
coding-standards:composer:check:
80+
desc: "Apply and check coding standards for Composer"
81+
cmds:
82+
- task: coding-standards:composer:apply
83+
- task composer -- audit
84+
- task composer -- normalize --dry-run
85+
- task composer -- validate --strict
86+
87+
coding-standards:markdown:apply:
88+
desc: "Apply coding standards for Markdown"
89+
cmds:
90+
- task compose -- run --rm markdownlint '**/*.md' --fix
91+
92+
coding-standards:markdown:check:
93+
desc: "Apply and check coding standards for Markdown"
94+
cmds:
95+
- task: coding-standards:markdown:apply
96+
- task compose -- run --rm markdownlint '**/*.md'
97+
98+
coding-standards:php:apply:
99+
desc: "Apply coding standards for PHP"
100+
cmds:
101+
- task compose -- exec phpfpm vendor/bin/rector
102+
- task compose -- exec phpfpm vendor/bin/php-cs-fixer fix
103+
silent: true
104+
105+
coding-standards:php:check:
106+
desc: "Apply and check coding standards for PHP"
107+
cmds:
108+
- task: coding-standards:php:apply
109+
- task compose -- exec phpfpm vendor/bin/rector --dry-run
110+
- task compose -- exec phpfpm vendor/bin/php-cs-fixer check
111+
silent: true
112+
113+
coding-standards:twig:apply:
114+
desc: "Apply coding standards for Twig"
115+
cmds:
116+
- task compose -- exec phpfpm vendor/bin/twig-cs-fixer fix
117+
silent: true
118+
119+
coding-standards:twig:check:
120+
desc: "Apply and check coding standards for Twig"
121+
cmds:
122+
- task: coding-standards:twig:apply
123+
- task compose -- exec phpfpm vendor/bin/twig-cs-fixer check
124+
silent: true
125+
126+
coding-standards:yaml:apply:
127+
desc: "Apply coding standards for YAML"
128+
cmds:
129+
- task compose -- run --rm prettier --parser yaml phpstan*.neon '**/*.{yml,yaml}' --write
130+
131+
coding-standards:yaml:check:
132+
desc: "Apply and check coding standards for YAML"
133+
cmds:
134+
- task: coding-standards:yaml:apply
135+
- task compose -- run --rm prettier --parser yaml phpstan*.neon '**/*.{yml,yaml}' --check
136+
137+
code-analysis:
138+
cmds:
139+
- task compose -- exec phpfpm vendor/bin/phpstan
140+
141+
docker-pull:
142+
desc: "Pull all development docker images"
143+
cmds:
144+
- docker pull jauderho/prettier
145+
- docker pull peterdavehello/markdownlint
146+
- task compose -- pull
147+
148+
default:
149+
cmds:
150+
- task --list-all
151+
silent: true

0 commit comments

Comments
 (0)