decole/symfony-flex-recipes
1
0
Fork 0
mirror of https://github.com/symfony/recipes.git synced 2026-09-11 23:26:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #156 from nicolas-grekas/no-getenv

Browse Source
This commit is contained in:
Symfony
2017-08-22 07:02:09 -07:00
committed by GitHub
parent 9dd224dd68 ca22a33dca
commit 57ea739e24
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php
+1 -1
View File
@@ -3,6 +3,6 @@
use Symfony\Component\Dotenv\Dotenv;
// The check is to ensure we don't use .env in production
if (!getenv('APP_ENV')) {
if (!isset($_SERVER['APP_ENV'])) {
(new Dotenv())->load(__DIR__.'/../../.env');
}
symfony/console/3.3/bin/console
+3 -3
View File
@@ -16,13 +16,13 @@ if (!class_exists(Application::class)) {
throw new \RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
}
if (!getenv('APP_ENV')) {
if (!isset($_SERVER['APP_ENV'])) {
(new Dotenv())->load(__DIR__.'/../.env');
}
$input = new ArgvInput();
$env = $input->getParameterOption(['--env', '-e'], getenv('APP_ENV') ?: 'dev');
$debug = getenv('APP_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']);
$env = $input->getParameterOption(['--env', '-e'], $_SERVER['APP_ENV'] ?? 'dev');
$debug = ($_SERVER['APP_DEBUG'] ?? true) !== '0' && !$input->hasParameterOption(['--no-debug', '']);
if ($debug && class_exists(Debug::class)) {
Debug::enable();
symfony/framework-bundle/3.3/public/index.php
+3 -3
View File
@@ -8,11 +8,11 @@ use Symfony\Component\HttpFoundation\Request;
require __DIR__.'/../vendor/autoload.php';
// The check is to ensure we don't use .env in production
if (!getenv('APP_ENV')) {
if (!isset($_SERVER['APP_ENV'])) {
(new Dotenv())->load(__DIR__.'/../.env');
}
if (getenv('APP_DEBUG')) {
if ($_SERVER['APP_DEBUG'] ?? true) {
// WARNING: You should setup permissions the proper way!
// REMOVE the following PHP line and read
// https://symfony.com/doc/current/book/installation.html#checking-symfony-application-configuration-and-setup
@@ -23,7 +23,7 @@ if (getenv('APP_DEBUG')) {
// Request::setTrustedProxies(['0.0.0.0/0'], Request::HEADER_FORWARDED);
$kernel = new Kernel(getenv('APP_ENV'), getenv('APP_DEBUG'));
$kernel = new Kernel($_SERVER['APP_ENV'] ?? 'dev', $_SERVER['APP_DEBUG'] ?? true);
$request = Request::createFromGlobals();
$response = $kernel->handle($request);
$response->send();