Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 11f5820

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Referencing scripts to avoid duplication Properly lock down app_dev.php Reduce touch icon to 32 colours and optimize updated VENDORS for 2.7.16
2 parents 2b661f7 + 72f0e3a commit 11f5820

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

composer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,19 @@
2323
"symfony/phpunit-bridge": "~2.7"
2424
},
2525
"scripts": {
26-
"post-install-cmd": [
26+
"symfony-scripts": [
2727
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
2828
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
2929
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
3030
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
3131
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
3232
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
3333
],
34+
"post-install-cmd": [
35+
"@symfony-scripts"
36+
],
3437
"post-update-cmd": [
35-
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
36-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
37-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
38-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
39-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
40-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
38+
"@symfony-scripts"
4139
]
4240
},
4341
"config": {

web/app_dev.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server')
15+
|| !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1')) || php_sapi_name() === '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.');

web/apple-touch-icon.png

-8.49 KB
Loading

0 commit comments

Comments
 (0)