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

Commit abd61b6

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

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
@@ -28,21 +28,19 @@
2828
"symfony/phpunit-bridge": "^3.0"
2929
},
3030
"scripts": {
31-
"post-install-cmd": [
31+
"symfony-scripts": [
3232
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
3333
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
3434
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
3535
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
3636
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
3737
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
3838
],
39+
"post-install-cmd": [
40+
"@symfony-scripts"
41+
],
3942
"post-update-cmd": [
40-
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
41-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
42-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
43-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
44-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
45-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
43+
"@symfony-scripts"
4644
]
4745
},
4846
"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'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
15+
|| !(in_array(@$_SERVER['REMOTE_ADDR'], ['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)