Skip to content

Commit

Permalink
Merge branch 'main' into renovate/twig-string-extra-3.x-lockfile
Browse files Browse the repository at this point in the history
  • Loading branch information
andibraeu authored Jan 30, 2025
2 parents 6ce3d60 + 80899d8 commit 6e3f530
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions .env.test
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# define your env variables for the test env here
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
APP_ENV=test
SYMFONY_DEPRECATIONS_HELPER='max[total]=320'
DATABASE_URL="sqlite:///%kernel.project_dir%/var/testdata.db"
4 changes: 2 additions & 2 deletions config/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
}

$env = $_SERVER['APP_ENV'] ?? 'dev';
if ($env === 'prod' && file_exists(dirname(__DIR__).'/.env.production')) {
(new Dotenv())->usePutenv()->overload(dirname(__DIR__).'/.env.production');
if ($env === 'prod' && file_exists(dirname(__DIR__).'/.env.prod')) {
(new Dotenv())->usePutenv()->overload(dirname(__DIR__).'/.env.prod');
}
if ($env === 'test' && file_exists(dirname(__DIR__).'/.env.test')) {
(new Dotenv())->usePutenv()->overload(dirname(__DIR__).'/.env.test');
Expand Down
6 changes: 6 additions & 0 deletions public/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php [QSA,L]
</IfModule>

0 comments on commit 6e3f530

Please sign in to comment.