Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ docker compose -f docker-compose.pgsql.yml exec mapbender php application/bin/co
Then create the database schema.

```bash
docker compose -f docker-compose.pgsql.yml exec mapbender php application/bin/console doctrine:schema:update --complete --force
docker compose -f docker-compose.pgsql.yml exec mapbender php application/bin/console doctrine:schema:update --force
```

And after that initialize the Mapbender database.
Expand Down
17 changes: 17 additions & 0 deletions application/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[{compose.yaml,compose.*.yaml}]
indent_size = 2

[*.md]
trim_trailing_whitespace = false
6 changes: 6 additions & 0 deletions application/.env
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,9 @@ JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
JWT_PASSPHRASE=<change_me>
###< lexik/jwt-authentication-bundle ###

###> symfony/routing ###
# Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
# See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
DEFAULT_URI=http://localhost
###< symfony/routing ###
4 changes: 4 additions & 0 deletions application/.env.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

###> symfony/framework-bundle ###
APP_SECRET=ea2c9ac1d3c98397477c0e0d2ddccfca
###< symfony/framework-bundle ###
1 change: 0 additions & 1 deletion application/bin/doctrine.php

This file was deleted.

2 changes: 1 addition & 1 deletion application/bin/phpunit
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ if (PHP_VERSION_ID < 80000) {
}
}

return include __DIR__ . '/..'.'/vendor/phpunit/phpunit/phpunit';
require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
20 changes: 10 additions & 10 deletions application/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
}
},
"require-dev": {
"dama/doctrine-test-bundle": "^7.3",
"phpunit/phpunit": "^10",
"symfony/browser-kit": "^6.4",
"symfony/debug-bundle": "^6.4",
"symfony/web-profiler-bundle": "^6.4"
"dama/doctrine-test-bundle": "^8.6",
"phpunit/phpunit": "^11.5",
"symfony/browser-kit": "^7.4",
"symfony/debug-bundle": "^7.4",
"symfony/web-profiler-bundle": "^7.4"
},
"require": {
"php": ">=8.1",
"php": ">=8.2",
"components/font-awesome": "^6.0",
"doctrine/dbal": "^3",
"doctrine/dbal": "^4.4",
"lexik/jwt-authentication-bundle": "^2",
"mapbender/digitizer": "dev-develop as 2.9.9",
"mapbender/mapbender": "dev-develop as 4.9.9",
"mapbender/digitizer": "dev-feature/symfony-doctrine-upgrade as 2.9.9",
"mapbender/mapbender": "dev-feature/symfony7-upgrade as 4.9.9",
"mnsami/composer-custom-directory-installer": "^1 || ^2",
"nelmio/api-doc-bundle": "^4.34",
"proj4js/proj4js": "^2.4",
Expand Down Expand Up @@ -171,7 +171,7 @@
},
"symfony": {
"allow-contrib": true,
"require": "6.4.*"
"require": "7.4.*"
}
},
"repositories": [
Expand Down
Loading