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

KUNST-72: The big upgrade #68

Merged
merged 49 commits into from
Aug 10, 2023
Merged
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
fbe2663
KUNST-72: The all in one go upgrade
rimi-itk Aug 1, 2023
f4aaea2
KUNST-72: Coding standards
rimi-itk Aug 1, 2023
a308a27
Webpack
rimi-itk Aug 1, 2023
281b8e5
Updated recipe doctrine/annotations
rimi-itk Aug 1, 2023
a826d57
Updated recipe doctrine/doctrine-bundle
rimi-itk Aug 1, 2023
c5c6563
Updated recipe doctrine/doctrine-migrations-bundle
rimi-itk Aug 1, 2023
1b04bd0
Updated recipe friendsofphp/php-cs-fixer
rimi-itk Aug 1, 2023
50fddb5
Updated recipe hautelook/alice-bundle
rimi-itk Aug 1, 2023
e14a2e1
Updated recipe liip/imagine-bundle
rimi-itk Aug 1, 2023
cdb6394
Updated recipe nelmio/alice
rimi-itk Aug 1, 2023
c4ce134
Updated recipe stof/doctrine-extensions-bundle
rimi-itk Aug 1, 2023
1a1edb8
Updated recipe symfony/console
rimi-itk Aug 1, 2023
b614aaa
Updated recipe symfony/flex
rimi-itk Aug 1, 2023
850c721
Updated recipe symfony/framework-bundle
rimi-itk Aug 1, 2023
3bb5ada
Updated recipe symfony/routing
rimi-itk Aug 1, 2023
e23cb2d
Updated recipe symfony/security-bundle
rimi-itk Aug 1, 2023
2513de2
Updated recipe symfony/translation
rimi-itk Aug 1, 2023
e62d824
Updated recipe symfony/twig-bundle
rimi-itk Aug 1, 2023
dc21faf
Updated recipe symfony/validator
rimi-itk Aug 1, 2023
3b44250
Updated recipe symfony/web-profiler-bundle
rimi-itk Aug 1, 2023
11a1aa5
Updated recipe symfony/webpack-encore-bundle
rimi-itk Aug 1, 2023
88d29c2
Updated recipe vich/uploader-bundle
rimi-itk Aug 1, 2023
f04dba1
KUNST-71: Fixed security stuff
rimi-itk Aug 2, 2023
ecf2c19
KUNST-71: Cleaned up item controller
rimi-itk Aug 2, 2023
9650350
KUNST-71: Assets
rimi-itk Aug 2, 2023
01236f9
KUNST-71: Added furniture fixtures
rimi-itk Aug 2, 2023
a75c5e9
KUNST-71: Fixed export
rimi-itk Aug 2, 2023
e2615be
KUNST-71: Cleaned up
rimi-itk Aug 2, 2023
782bc41
KUNST-71: Added production documentation
rimi-itk Aug 2, 2023
95c295c
KUNST-71: Cleaned up migration
rimi-itk Aug 2, 2023
47d46f3
KUNST-71: Fixed item import
rimi-itk Aug 2, 2023
29194df
KUNST-71: Cleaned up item controller
rimi-itk Aug 2, 2023
81c1987
KUNST-71: Cleaned up commands
rimi-itk Aug 2, 2023
bec2f4c
KUNST-71: Improved fixtures
rimi-itk Aug 2, 2023
f734d86
KUNST-71: Removed duplicated secret
rimi-itk Aug 3, 2023
84c6466
KUNST-71: Updated documentation
rimi-itk Aug 3, 2023
b2d17ca
KUNST-71: Updated comment
rimi-itk Aug 3, 2023
a36cf3a
Node 18 and assets
rimi-itk Aug 1, 2023
bd6e96d
KUNST-72: Use bs5 twig forms
yepzdk Aug 4, 2023
275ba2b
KUNST-72: Add missing browserslist and postcss to silence the console…
yepzdk Aug 4, 2023
5df8aa7
KUNST-72: setup select2 for bs5
yepzdk Aug 4, 2023
8d679d8
KUNST-72: Import full bs5
yepzdk Aug 4, 2023
b5229a2
KUNST-72: Migrate bs5 classes
yepzdk Aug 4, 2023
fb78d74
KUNST-72: Migrate bs5 classes
yepzdk Aug 4, 2023
a56feeb
KUNST-72: better handling of util btn in admin
yepzdk Aug 4, 2023
af7070f
KUNST-71: Updated changelog
yepzdk Aug 4, 2023
c913469
KUNST-71: Fixed check for form field
rimi-itk Aug 4, 2023
687862b
Cleaned up
rimi-itk Aug 4, 2023
1d50b22
Merge pull request #69 from itk-dev/feature/KUNST-72-update-assets
rimi-itk Aug 4, 2023
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
34 changes: 27 additions & 7 deletions .env
Original file line number Diff line number Diff line change
@@ -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:db_password@127.0.0.1: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:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
# DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1: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'
60 changes: 0 additions & 60 deletions .github/workflows/deployment_dev.yml

This file was deleted.

61 changes: 0 additions & 61 deletions .github/workflows/deployment_prod.yml

This file was deleted.

81 changes: 33 additions & 48 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
11 changes: 2 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

###> symfony/framework-bundle ###
/.env.local
/.env.local.php
Expand All @@ -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 ###
Expand Down
12 changes: 12 additions & 0 deletions .markdownlintrc
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion .php_cs.dist → .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
[
Expand Down
1 change: 0 additions & 1 deletion .php-version

This file was deleted.

37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic
Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

[PR-69](https://github.com/itk-dev/kunstdatabasen/pull/69)
Update assets

### Changed

- Upgraded to Symfony 6.3.

[1.5.2] - yyyy-mm-dd
[1.5.1] - yyyy-mm-dd
[1.5.0] - yyyy-mm-dd
[1.4.0] - yyyy-mm-dd
[1.3.1] - yyyy-mm-dd
[1.3.0] - yyyy-mm-dd
[1.2.0] - yyyy-mm-dd
[1.1.0] - yyyy-mm-dd
[1.0.0] - yyyy-mm-dd

[Unreleased]: https://github.com/itk-dev/kunstdatabasen/compare/1.5.2...HEAD
[1.5.2]: https://github.com/itk-dev/kunstdatabasen/compare/1.5.1...1.5.2
[1.5.1]: https://github.com/itk-dev/kunstdatabasen/compare/1.5.0...1.5.1
[1.5.0]: https://github.com/itk-dev/kunstdatabasen/compare/1.4.0...1.5.0
[1.4.0]: https://github.com/itk-dev/kunstdatabasen/compare/1.3.1...1.4.0
[1.3.1]: https://github.com/itk-dev/kunstdatabasen/compare/1.3.0...1.3.1
[1.3.0]: https://github.com/itk-dev/kunstdatabasen/compare/1.2.0...1.3.0
[1.2.0]: https://github.com/itk-dev/kunstdatabasen/compare/1.1.0...1.2.0
[1.1.0]: https://github.com/itk-dev/kunstdatabasen/compare/1.0.0...1.1.0
[1.0.0]: https://github.com/itk-dev/kunstdatabasen/releases/tag/1.0.0
Loading
Loading