Skip to content

Commit dc7ae36

Browse files
committed
feature #1410 Update recipes (fabpot)
This PR was merged into the main branch. Discussion ---------- Update recipes Commits ------- 462f4da Update recipes
2 parents 83f8308 + 462f4da commit dc7ae36

File tree

6 files changed

+30
-24
lines changed

6 files changed

+30
-24
lines changed

.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ APP_SECRET=2ca64f8d83b9e89f5f19d672841d6bb8
2626
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
2727
#
2828
DATABASE_URL=sqlite:///%kernel.project_dir%/data/database.sqlite
29-
# DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7",
30-
# DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=13&charset=utf8"
29+
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4"
30+
# DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
3131
###< doctrine/doctrine-bundle ###
3232

3333
###> symfony/mailer ###

config/packages/doctrine.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ doctrine:
44

55
# IMPORTANT: You MUST configure your server version,
66
# either here or in the DATABASE_URL env var (see .env file)
7-
#server_version: '14'
7+
#server_version: '15'
88
orm:
99
auto_generate_proxy_classes: true
10+
enable_lazy_ghost_objects: true
1011
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
1112
auto_mapping: true
1213
mappings:
@@ -27,6 +28,7 @@ when@prod:
2728
doctrine:
2829
orm:
2930
auto_generate_proxy_classes: false
31+
proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies'
3032
query_cache_driver:
3133
type: pool
3234
pool: doctrine.system_cache_pool

config/packages/webpack_encore.yaml

+7-11
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,16 @@ webpack_encore:
2525

2626
# If you have multiple builds:
2727
# builds:
28-
# pass "frontend" as the 3rg arg to the Twig functions
29-
# {{ encore_entry_script_tags('entry1', null, 'frontend') }}
30-
3128
# frontend: '%kernel.project_dir%/public/frontend/build'
3229

33-
# Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
34-
# Put in config/packages/prod/webpack_encore.yaml
35-
# cache: true
30+
# pass the build name as the 3rd argument to the Twig functions
31+
# {{ encore_entry_script_tags('entry1', null, 'frontend') }}
3632

37-
#when@prod:
38-
# webpack_encore:
39-
# # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
40-
# # Available in version 1.2
41-
# cache: true
33+
when@prod:
34+
webpack_encore:
35+
# Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
36+
# Available in version 1.2
37+
cache: true
4238

4339
#when@test:
4440
# webpack_encore:

public/.htaccess

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ DirectoryIndex index.php
1818
</IfModule>
1919

2020
<IfModule mod_rewrite.c>
21+
# This Option needs to be enabled for RewriteRule, otherwise it will show an error like
22+
# 'Options FollowSymLinks or SymLinksIfOwnerMatch is off which implies that RewriteRule directive is forbidden'
23+
Options +FollowSymlinks
24+
2125
RewriteEngine On
2226

2327
# Determine the RewriteBase automatically and set it as environment variable.

symfony.lock

+10-10
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
"version": "v0.5.3"
3434
},
3535
"doctrine/doctrine-bundle": {
36-
"version": "2.7",
36+
"version": "2.8",
3737
"recipe": {
3838
"repo": "github.com/symfony/recipes",
3939
"branch": "main",
40-
"version": "2.4",
41-
"ref": "d562b46dd8075ab2de3d58bf7895cf6b8365cb72"
40+
"version": "2.8",
41+
"ref": "6b43b7b6ff6bf2551f2933ebeb66721fa3db8fbc"
4242
},
4343
"files": [
4444
"config/packages/doctrine.yaml",
@@ -153,9 +153,9 @@
153153
"version": "1.0",
154154
"recipe": {
155155
"repo": "github.com/symfony/recipes-contrib",
156-
"branch": "master",
156+
"branch": "main",
157157
"version": "1.0",
158-
"ref": "9d254a22efca7264203eea98b866f16f944b2f09"
158+
"ref": "efb318193e48384eb5c5aadff15396ed698f8ffc"
159159
},
160160
"files": [
161161
"public/.htaccess"
@@ -294,7 +294,7 @@
294294
"repo": "github.com/symfony/recipes",
295295
"branch": "main",
296296
"version": "4.3",
297-
"ref": "97a61eabb351d7f6cb7702039bcfe07fe9d7e03c"
297+
"ref": "2bf89438209656b85b9a49238c4467bff1b1f939"
298298
},
299299
"files": [
300300
"config/packages/mailer.yaml"
@@ -334,12 +334,12 @@
334334
"version": "v6.0.0"
335335
},
336336
"symfony/phpunit-bridge": {
337-
"version": "5.4",
337+
"version": "6.2",
338338
"recipe": {
339339
"repo": "github.com/symfony/recipes",
340-
"branch": "master",
340+
"branch": "main",
341341
"version": "5.3",
342-
"ref": "97cb3dc7b0f39c7cfc4b7553504c9d7b7795de96"
342+
"ref": "819d3d2ffa4590eba0b8f4f3e5e89415ee4e45c3"
343343
},
344344
"files": [
345345
".env.test",
@@ -505,7 +505,7 @@
505505
"repo": "github.com/symfony/recipes",
506506
"branch": "main",
507507
"version": "1.10",
508-
"ref": "5878c7c28468ca0fdce2497a04cfc66bab0dc3ef"
508+
"ref": "f8fc53f1942f76679e9ee3c25fd44865355707b5"
509509
},
510510
"files": [
511511
"assets/app.js",

tests/bootstrap.php

+4
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@
1818
} elseif (method_exists(Dotenv::class, 'bootEnv')) {
1919
(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
2020
}
21+
22+
if ($_SERVER['APP_DEBUG']) {
23+
umask(0000);
24+
}

0 commit comments

Comments
 (0)