Skip to content

Commit

Permalink
Merge branch '1.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
andrerom committed Oct 13, 2017
2 parents fa6a023 + caf1d2b commit 81c73e7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ return PhpCsFixer\Config::create()
'phpdoc_to_comment' => false,
'cast_spaces' => false,
'blank_line_after_opening_tag' => false,
'single_blank_line_before_namespace' => false,
'phpdoc_annotation_without_dot' => false,
'phpdoc_no_alias_tag' => false,
'space_after_semicolon' => false,
'yoda_style' => false,
'no_break_comment' => false,
])
->setRiskyAllowed(true)
->setFinder(
Expand Down
2 changes: 1 addition & 1 deletion doc/docker/selenium.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
networks:
- backend
# Because of: https://github.com/elgalu/docker-selenium/issues/20
shm_size: 128m
shm_size: 256m

app:
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion web/app_dev.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Feel free to remove this, extend it, or make something more sophisticated at your own risk.
if (isset($_SERVER['HTTP_CLIENT_IP'])
|| isset($_SERVER['HTTP_X_FORWARDED_FOR'])
|| !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
|| !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || 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.');
Expand Down

0 comments on commit 81c73e7

Please sign in to comment.