8000 Merge branch '2.8' into 3.2 · symfony/symfony-standard@a253972 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit a253972

Browse files
fabpotfabpot
committed
Merge branch '2.8' into 3.2
* 2.8: removed obsolete var updated composer deps app.php and console: no need to declare $loader variable Minor tweaks in app_dev.php to cover some PHP-CS-Fixer rules updated VENDORS for 2.8.22 updated VENDORS for 2.7.29 Improve PSR-4 autoload by default
2 parents 6a2635d + 7cabe02 commit a253972

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

‎bin/console

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ use Symfony\Component\Debug\Debug;
1212

1313
set_time_limit(0);
1414

15-
/** @var Composer\Autoload\ClassLoader $loader */
16-
$loader = require __DIR__.'/../app/autoload.php';
15+
require __DIR__.'/../app/autoload.php';
1716

1817
$input = new ArgvInput();
1918
$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');

‎composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
"type": "project",
55
"description": "The \"Symfony Standard Edition\" distribution",
66
"autoload": {
7-
"psr-4": { "": "src/" },
7+
"psr-4": {
8+
"AppBundle\\": "src/AppBundle"
9+
},
810
"classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
911
},
1012
"autoload-dev": {

‎web/app.php

Lines changed: 1 addition & 2 deletions
< 8000 td data-grid-cell-id="diff-5a57581370a15cf9a18cd967b1f2a25bc15f0fb3424aef81c8f00434bdc40d84-6-5-2" data-line-anchor="diff-5a57581370a15cf9a18cd967b1f2a25bc15f0fb3424aef81c8f00434bdc40d84R5" data-selected="false" role="gridcell" style="background-color:var(--diffBlob-additionLine-bgColor, var(--diffBlob-addition-bgColor-line));padding-right:24px" tabindex="-1" valign="top" class="focusable-grid-cell diff-text-cell right-side-diff-cell left-side">+
require __DIR__.'/../app/autoload.php';
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
use Symfony\Component\HttpFoundation\Request;
44

5-
/** @var \Composer\Autoload\ClassLoader $loader */
6-
$loader = require __DIR__.'/../app/autoload.php';
5
76
include_once __DIR__.'/../var/bootstrap.php.cache';
87

98
$kernel = new AppKernel('prod', false);

‎web/app_dev.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

3-
use Symfony\Component\HttpFoundation\Request;
43
use Symfony\Component\Debug\Debug;
4+
use Symfony\Component\HttpFoundation\Request;
55

66
// If you don't want to setup permissions the proper way, just uncomment the following PHP line
77
// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
@@ -12,7 +12,7 @@
1212
// Feel free to remove this, extend it, or make something more sophisticated.
1313
if (isset($_SERVER['HTTP_CLIENT_IP'])
1414
|| isset($_SERVER['HTTP_X_FORWARDED_FOR'])
15-
|| !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1']) || PHP_SAPI === 'cli-server')
15+
|| !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'], true) || PHP_SAPI === 'cli-server')
1616
) {
1717
header('HTTP/1.0 403 Forbidden');
1818
exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');

0 commit comments

Comments
 (0)
0