Skip to content

Update recipes #1410

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

Merged
merged 1 commit into from
Mar 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ APP_SECRET=2ca64f8d83b9e89f5f19d672841d6bb8
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
#
DATABASE_URL=sqlite:///%kernel.project_dir%/data/database.sqlite
# DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7",
# DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=13&charset=utf8"
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4"
# DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
###< doctrine/doctrine-bundle ###

###> symfony/mailer ###
Expand Down
4 changes: 3 additions & 1 deletion config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ doctrine:

# IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file)
#server_version: '14'
#server_version: '15'
orm:
auto_generate_proxy_classes: true
enable_lazy_ghost_objects: true
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
auto_mapping: true
mappings:
Expand All @@ -27,6 +28,7 @@ when@prod:
doctrine:
orm:
auto_generate_proxy_classes: false
proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies'
query_cache_driver:
type: pool
pool: doctrine.system_cache_pool
Expand Down
18 changes: 7 additions & 11 deletions config/packages/webpack_encore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,16 @@ webpack_encore:

# If you have multiple builds:
# builds:
# pass "frontend" as the 3rg arg to the Twig functions
# {{ encore_entry_script_tags('entry1', null, 'frontend') }}

# frontend: '%kernel.project_dir%/public/frontend/build'

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

#when@prod:
# webpack_encore:
# # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
# # Available in version 1.2
# cache: true
when@prod:
webpack_encore:
# Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
# Available in version 1.2
cache: true

#when@test:
# webpack_encore:
Expand Down
4 changes: 4 additions & 0 deletions public/.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ DirectoryIndex index.php
</IfModule>

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

RewriteEngine On

# Determine the RewriteBase automatically and set it as environment variable.
Expand Down
20 changes: 10 additions & 10 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
"version": "v0.5.3"
},
"doctrine/doctrine-bundle": {
"version": "2.7",
"version": "2.8",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "2.4",
"ref": "d562b46dd8075ab2de3d58bf7895cf6b8365cb72"
"version": "2.8",
"ref": "6b43b7b6ff6bf2551f2933ebeb66721fa3db8fbc"
},
"files": [
"config/packages/doctrine.yaml",
Expand Down Expand Up @@ -153,9 +153,9 @@
"version": "1.0",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
"branch": "master",
"branch": "main",
"version": "1.0",
"ref": "9d254a22efca7264203eea98b866f16f944b2f09"
"ref": "efb318193e48384eb5c5aadff15396ed698f8ffc"
},
"files": [
"public/.htaccess"
Expand Down Expand Up @@ -294,7 +294,7 @@
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "4.3",
"ref": "97a61eabb351d7f6cb7702039bcfe07fe9d7e03c"
"ref": "2bf89438209656b85b9a49238c4467bff1b1f939"
},
"files": [
"config/packages/mailer.yaml"
Expand Down Expand Up @@ -334,12 +334,12 @@
"version": "v6.0.0"
},
"symfony/phpunit-bridge": {
"version": "5.4",
"version": "6.2",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "master",
"branch": "main",
"version": "5.3",
"ref": "97cb3dc7b0f39c7cfc4b7553504c9d7b7795de96"
"ref": "819d3d2ffa4590eba0b8f4f3e5e89415ee4e45c3"
},
"files": [
".env.test",
Expand Down Expand Up @@ -505,7 +505,7 @@
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "1.10",
"ref": "5878c7c28468ca0fdce2497a04cfc66bab0dc3ef"
"ref": "f8fc53f1942f76679e9ee3c25fd44865355707b5"
},
"files": [
"assets/app.js",
Expand Down
4 changes: 4 additions & 0 deletions tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@
} elseif (method_exists(Dotenv::class, 'bootEnv')) {
(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
}

if ($_SERVER['APP_DEBUG']) {
umask(0000);
}