From 0aa91015ffcdb8740f0c8d7ecd860af0cf6b44d5 Mon Sep 17 00:00:00 2001
From: Alexey Skobkin <skobkin-ru@ya.ru>
Date: Sat, 19 Jan 2019 02:34:51 +0300
Subject: [PATCH] app/console, web{app,app_dev}.php updated according to new
 symfony-standard distribution.

---
 app/console     | 19 +++++--------------
 web/app.php     | 17 +++++++----------
 web/app_dev.php | 22 ++++++++--------------
 3 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/app/console b/app/console
index ade8bbc..f14e052 100755
--- a/app/console
+++ b/app/console
@@ -1,29 +1,20 @@
 #!/usr/bin/env php
 <?php
-
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Debug\Debug;
-
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
-// read http://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
+// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
 // for more information
-//umask(0000);
 umask(0002);
-
 set_time_limit(0);
-
-/** @var \Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/autoload.php';
-
+require __DIR__.'/../vendor/autoload.php';
 $input = new ArgvInput();
-$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
-$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
-
+$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev', true);
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption('--no-debug', true) && $env !== 'prod';
 if ($debug) {
     Debug::enable();
 }
-
 $kernel = new AppKernel($env, $debug);
 $application = new Application($kernel);
-$application->run($input);
+$application->run($input);
\ No newline at end of file
diff --git a/web/app.php b/web/app.php
index 6b784b9..433163b 100644
--- a/web/app.php
+++ b/web/app.php
@@ -1,17 +1,14 @@
 <?php
-
 use Symfony\Component\HttpFoundation\Request;
-
-/** @var \Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/../app/autoload.php';
-include_once __DIR__.'/../app/bootstrap.php.cache';
-
-umask(0002);
-
+require __DIR__.'/../vendor/autoload.php';
+if (PHP_VERSION_ID < 70000) {
+    include_once __DIR__.'/../app/bootstrap.php.cache';
+}
 $kernel = new AppKernel('prod', false);
-$kernel->loadClassCache();
+if (PHP_VERSION_ID < 70000) {
+    $kernel->loadClassCache();
+}
 //$kernel = new AppCache($kernel);
-
 // When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
 //Request::enableHttpMethodParameterOverride();
 $request = Request::createFromGlobals();
diff --git a/web/app_dev.php b/web/app_dev.php
index ad4e9af..1d9e45f 100644
--- a/web/app_dev.php
+++ b/web/app_dev.php
@@ -1,31 +1,25 @@
 <?php
-
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Debug\Debug;
-
+use Symfony\Component\HttpFoundation\Request;
 // If you don't want to setup permissions the proper way, just uncomment the following PHP line
-// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
+// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
+// for more information
 umask(0002);
-
 // This check prevents access to debug front controllers that are deployed by accident to production servers.
 // Feel free to remove this, extend it, or make something more sophisticated.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !(
-        in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) ||
-        php_sapi_name() === 'cli-server'
-    )
+    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'], true) || PHP_SAPI === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
     exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
 }
-
-/** @var \Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/../app/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 Debug::enable();
-
 $kernel = new AppKernel('dev', true);
-$kernel->loadClassCache();
+if (PHP_VERSION_ID < 70000) {
+    $kernel->loadClassCache();
+}
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();