Skip to content

Commit 5d64312

Browse files
Merge pull request #45 from developeregrem/3.0.0-dev
3.0.0 dev
2 parents 3375d1c + af16bb4 commit 5d64312

264 files changed

Lines changed: 15922 additions & 4584 deletions

File tree

Some content is hidden

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

composer.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,48 @@
22
"type": "project",
33
"license": "proprietary",
44
"require": {
5-
"php": ">=7.2.5",
5+
"php": ">=7.4.0",
66
"ext-ctype": "*",
77
"ext-iconv": "*",
8-
"doctrine/doctrine-bundle": "^2.0",
8+
"doctrine/doctrine-bundle": "^2.4",
99
"doctrine/doctrine-fixtures-bundle": "^3.3",
10+
"doctrine/annotations": "^1.0",
11+
"doctrine/doctrine-migrations-bundle": "^3.1",
12+
"doctrine/orm": "^2.9",
1013
"mpdf/mpdf": "^8.0",
11-
"sensio/framework-extra-bundle": "^5.5",
12-
"symfony/asset": "^5.2",
13-
"symfony/console": "^5.2",
14-
"symfony/dotenv": "^5.2",
15-
"symfony/expression-language": "^5.2",
14+
"sensio/framework-extra-bundle": "^6.1",
15+
"symfony/asset": "^5.3",
16+
"symfony/console": "^5.3",
17+
"symfony/dotenv": "^5.3",
18+
"symfony/expression-language": "^5.3",
1619
"symfony/flex": "^1.3.1",
17-
"symfony/form": "^5.2",
18-
"symfony/framework-bundle": "^5.2",
19-
"symfony/http-client": "^5.2",
20-
"symfony/intl": "^5.2",
21-
"symfony/mailer": "^5.2",
22-
"symfony/mime": "^5.2",
20+
"symfony/form": "^5.3",
21+
"symfony/framework-bundle": "^5.3",
22+
"symfony/http-client": "^5.3",
23+
"symfony/intl": "^5.3",
24+
"symfony/mailer": "^5.3",
25+
"symfony/mime": "^5.3",
2326
"symfony/monolog-bundle": "^3.1",
24-
"symfony/orm-pack": "*",
25-
"symfony/security-bundle": "^5.2",
26-
"symfony/serializer-pack": "*",
27-
"symfony/translation": "^5.2",
28-
"symfony/twig-bundle": "^5.2",
29-
"symfony/validator": "^5.2",
30-
"symfony/web-link": "^5.2",
31-
"symfony/yaml": "^5.2",
27+
"symfony/security-bundle": "^5.3",
28+
"symfony/serializer": "5.3.*",
29+
"symfony/translation": "^5.3",
30+
"symfony/twig-bundle": "^5.3",
31+
"symfony/validator": "^5.3",
32+
"symfony/web-link": "^5.3",
33+
"symfony/yaml": "^5.3",
3234
"symfonycasts/reset-password-bundle": "^1.3"
3335
},
3436
"require-dev": {
3537
"symfony/browser-kit": "^5.2",
36-
"symfony/css-selector": "^5.2",
37-
"symfony/debug-pack": "*",
38+
"symfony/css-selector": "^5.3",
39+
"symfony/debug-bundle": "5.3.*",
3840
"symfony/maker-bundle": "^1.0",
39-
"symfony/phpunit-bridge": "^5.2",
40-
"symfony/profiler-pack": "*"
41+
"symfony/phpunit-bridge": "^5.3",
42+
"symfony/stopwatch": "5.3.*",
43+
"symfony/web-profiler-bundle": "5.3.*"
4144
},
4245
"config": {
46+
"optimize-autoloader": true,
4347
"preferred-install": {
4448
"*": "dist"
4549
},
@@ -56,13 +60,9 @@
5660
}
5761
},
5862
"replace": {
59-
"paragonie/random_compat": "2.*",
6063
"symfony/polyfill-ctype": "*",
6164
"symfony/polyfill-iconv": "*",
62-
"symfony/polyfill-php72": "*",
63-
"symfony/polyfill-php71": "*",
64-
"symfony/polyfill-php70": "*",
65-
"symfony/polyfill-php56": "*"
65+
"symfony/polyfill-php72": "*"
6666
},
6767
"scripts": {
6868
"auto-scripts": {
@@ -82,7 +82,7 @@
8282
"extra": {
8383
"symfony": {
8484
"allow-contrib": false,
85-
"require": "5.2.*"
85+
"require": "5.3.*"
8686
}
8787
}
8888
}
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
doctrine_migrations:
22
migrations_paths:
3-
'DoctrineMigrations': '%kernel.project_dir%/src/Migrations'
3+
# namespace is arbitrary but should be different from App\Migrations
4+
# as migrations classes should NOT be autoloaded
5+
'DoctrineMigrations': '%kernel.project_dir%/migrations'
6+
enable_profiler: '%kernel.debug%'

config/packages/framework.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ framework:
22
secret: '%env(APP_SECRET)%'
33
#default_locale: en
44
#csrf_protection: true
5-
#http_method_override: true
5+
http_method_override: false
66

77
# Enables session support. Note that the session will ONLY be started if you read or write from it.
88
# Remove or comment this section to explicitly disable session support.
99
session:
10-
handler_id: ~
10+
handler_id: null
1111
cookie_secure: 'auto'
1212
cookie_samesite: 'lax'
13+
storage_factory_id: session.storage.factory.native
1314

1415
#esi: true
1516
#fragments: true
@@ -30,3 +31,9 @@ framework:
3031

3132
# APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues)
3233
#app: cache.adapter.apcu
34+
35+
when@test:
36+
framework:
37+
test: true
38+
session:
39+
storage_factory_id: session.storage.factory.mock_file

config/packages/prod/doctrine.yaml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
11
doctrine:
22
orm:
33
metadata_cache_driver:
4-
type: service
5-
id: doctrine.system_cache_provider
4+
type: pool
5+
pool: doctrine.system_cache_pool
66
query_cache_driver:
7-
type: service
8-
id: doctrine.system_cache_provider
7+
type: pool
8+
pool: doctrine.system_cache_pool
99
result_cache_driver:
10-
type: service
11-
id: doctrine.result_cache_provider
12-
13-
services:
14-
doctrine.result_cache_provider:
15-
class: Symfony\Component\Cache\DoctrineProvider
16-
public: false
17-
arguments:
18-
- '@doctrine.result_cache_pool'
19-
doctrine.system_cache_provider:
20-
class: Symfony\Component\Cache\DoctrineProvider
21-
public: false
22-
arguments:
23-
- '@doctrine.system_cache_pool'
10+
type: pool
11+
pool: doctrine.result_cache_pool
2412

2513
framework:
2614
cache:

config/packages/prod/routing.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

config/packages/routing.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
framework:
22
router:
3-
strict_requirements: ~
4-
utf8: true
3+
utf8: true
4+
5+
when@prod:
6+
framework:
7+
router:
8+
strict_requirements: null
9+

config/packages/security.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
security:
22
enable_authenticator_manager: true
3-
encoders:
3+
password_hashers:
44
App\Entity\User:
55
algorithm: auto
66
# https://symfony.com/doc/current/security.html#where-do-users-come-from-user-providers
@@ -25,6 +25,7 @@ security:
2525
target: /
2626
remember_me:
2727
secret: '%kernel.secret%'
28+
lazy: true
2829

2930
# activate different ways to authenticate
3031

config/packages/test/framework.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

config/packages/translation.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ framework:
1818
- '%kernel.project_dir%/translations/Templates'
1919
- '%kernel.project_dir%/translations/Users'
2020
- '%kernel.project_dir%/translations/RoomCategory'
21+
- '%kernel.project_dir%/translations/ReservationStatus'

config/packages/twig.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
twig:
2-
paths: ['%kernel.project_dir%/templates']
2+
default_path: '%kernel.project_dir%/templates'
33
debug: '%kernel.debug%'
44
strict_variables: '%kernel.debug%'
5-
form_themes: ['form/fewohbee_bootstrap_4_layout.html.twig']
5+
form_themes: ['form/fewohbee_bootstrap_5_layout.html.twig']

0 commit comments

Comments
 (0)